Merge pull request #1007 from op-jenkins/op-build-update_92_4-5-2017

op-build update 4-5-2017