Merged in issue/CONFSRVDEV-6415-seven-Ã¥ (pull request #27)
CONFSRVDEV-6415: upgrade maven version
CONFSRVDEV-6415: fix compile errors against 7.0 now that deprecated code is removed
CONFSRVDEV-6415: upgrade maven version
CONFSRVDEV-6415: fix compile errors against 7.0 now that deprecated code is removed