Merge pull request #811 from op-jenkins/op_update_05_1-16-2017

op-build update 1-16-2017