Refactoring defect tracker package
Merge branch '2.1' into qa