Merge pull request #1407 from op-jenkins/op-build-update_1328_9-6-2017

op-build update 9-6-2017