CSPACE-5842: CSPACE-5865: Updating poms to compile with Java 1.7 compiler.  Also changed login tests to restore valid login state after tests complete.
Merge branch 'master' of github.com:collectionspace/application
Merge branch 'master' into ucb-deploy
Merge branch 'ucb-deploy_3.2' into pahma_3.2