CRM-12623 mgd and other misc fixes
Merge pull request #2 from deepak-srivastava/hr

CRM-12623 mgd and other misc fixes