Merge pull request #1001 from op-jenkins/op-build-update_1013_4-3-2017

op-build update 4-3-2017