Merge pull request #884 from op-jenkins/op_update_05_2-23-2017

op-build update 2-23-2017