cleanup, avoid using derpecated apis, etc
Merge branch 'master' into NEXUS-6027-testsuite-cleanup
Merge pull request #256 from sonatype/NEXUS-6027-testsuite-cleanup

Nexus 6027 testsuite cleanup