Fixed FindBugs + IDEA errors
Merge branch '2.0M2' of https://github.com/denimgroup/threadfix into 2.0M2