Merge pull request #1423 from op-jenkins/op-build-update_839_9-11-2017

op-build update 9-11-2017