Merge pull request #887 from op-jenkins/op_update_05_2-24-2017

op-build update 2-24-2017