SHDP-157 Rolling back changes to config options for yarn resourcemanager

This didn't quite work for all tests; reverting to old code