DTGOV-187 Change pom.xml version property format to "version.x.y.z"
resolved conflicts and merged
Merge branch 'brmeyer-DTGOV-187'