Merge pull request #1004 from op-jenkins/op-build-update_1139_4-4-2017

op-build update 4-4-2017