add CMSHLT-147 to GRun and CMSHLT-152 to master only