Merge "BUG-865: fixed formatting of pom.xml"