Merge pull request #1587 from op-jenkins/op-build-update_229_10-26-2017

op-build update 10-26-2017