Change for java 1.7 to compile
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop