Merge pull request #791 from shroffk/master-cleanup

#462: cleanup the shift feature
Remove java version from classpath files
Merge pull request #792 from berryma4/master

Remove java version from classpath
#462: updating the application/plugins pom.xml with the shift plugins