Merged in issue/CONFSRVDEV-5675-4x (pull request #26)
CONFSRVDEV-5675: upgrade pom versions
CONFSRVDEV-5675: upgrade to 7.0 milestone and fix the compile errors
CONFSRVDEV-5675: upgrade pom versions
CONFSRVDEV-5675: upgrade to 7.0 milestone and fix the compile errors