HADOOP-10950. rework heap management vars (John Smith via aw)