Merge pull request #869 from op-jenkins/op_update_05_2-14-2017

op-build update 2-14-2017