Merge branch '2.2i5' into qa-sprint
Tests added and patched
Merge branch 'qa-sprint' of https://github.com/denimgroup/threadfix into qa-sprint