Small changes to make the modified CBTOOL-compatible HiBench version more
similar to the intel version.
Additional small changes to make diff between intel-hibench and cbtool-hibench
closer to minimal.