Merge YARN and CloudBench changes to hibench-config.sh