Merge pull request #1338 from stewart-ibm/fix-build-revert-hb-update

Revert "op-build update 8-12-2017"