Merge branch '2.2i2' into qa-sprint
Merge branch 'qa-sprint' of https://github.com/denimgroup/threadfix into qa-sprint