Merge pull request #916 from op-jenkins/op_update_05_3-14-2017

op-build update 3-14-2017