JDF-454 Changes - Remove QSTools Violations

It includes #599 Changes plus other changes.