Merge pull request #996 from op-jenkins/op-build-update_1223_3-31-2017

op-build update 3-31-2017