Merge bmake-20170510No-op change other than version update.
Merge bmake-20160512
Merge bmake-20130123Approved by: marcel (mentor)