Moves maven configs around so that the profiles will play nicer in CI.
Removes broken and commented out tests in HttpRestUtilsTests.java
Merge branch '2.1M2' into qa
I fixed the pom and test class conflicts.
Conflicts:
	threadfix-cli-importers/pom.xml
	threadfix-cli/pom.xml
	threadfix-cli/src/test/java/com/denimgroup/threadfix/cli/ThreadFixRestClientIT.java
	threadfix-cli/src/test/java/com/denimgroup/threadfix/cli/ThreadFixRestClientTests.java
	threadfix-ham/pom.xml
	threadfix-main/pom.xml
	threadfix-main/src/test/java/com/denimgroup/threadfix/webservices/tests/CommandLineParserIT.java
	threadfix-main/src/test/java/com/denimgroup/threadfix/webservices/tests/HttpRestUtilsIT.java
	threadfix-main/src/test/java/com/denimgroup/threadfix/webservices/tests/ThreadFixRestClientIT.java