Merge pull request #1575 from op-jenkins/op-build-update_039_10-20-2017

op-build update 10-20-2017