Changes for multiple scan import and merge.
Merge branch '2.1M1' of https://github.com/denimgroup/threadfix.git into 2.1M1
Add scanner recommendations
Merge branch '2.1M1' of https://github.com/denimgroup/threadfix.git into 2.1M1
Tons o changes
Added some filtering ability and CWE support
Merge branch '2.1M1' of https://github.com/denimgroup/threadfix.git into
2.1M1

Conflicts:
	threadfix-importers/src/main/java/com/denimgroup/threadfix/importer/impl/upload/ArachniChannelImporter.java
Cleanup
Ignore local JDBC changes
Merge branch '2.1M1br' of https://github.com/bobrich/threadfix into bobrich-2.1M1br

Conflicts:
	threadfix-importers/src/main/java/com/denimgroup/threadfix/importer/update/ScannerMappingsUpdaterServiceImpl.java
Merge branch 'bobrich-2.1M1br' into 2.1M1
Closes #292: merge commit Bobrich's