Merge pull request #995 from op-jenkins/op-build-update_941_3-31-2017

op-build update 3-31-2017