Merge pull request #1017 from op-jenkins/op-build-update_1328_4-10-2017

op-build update 4-10-2017