Merge pull request #1626 from op-jenkins/op-build-update_1047_11-15-2017

op-build update 11-15-2017