Removing HPQC folder. Only hpqc is present now.
Merge branch '2.1' into qa