Merge pull request #955 from op-jenkins/op_update_05_3-22-2017

op-build update 3-22-2017