Merge branch '2.1final' into qa
Merge branch 'qa' of https://github.com/denimgroup/threadfix into qa
minor changes