Resubmit of the fixes
Merge pull request #5695 from lihux25/hcal_relval_fix_Oct_05_2014

Hcal relval fixes