Clean up Maven folder structure and POM layout to generate better
build output on the "package" goal. (ABM-147)
Merge branch 'feature-maven-improvements' into develop