Merge pull request #845 from op-jenkins/op_update_05_1-31-2017

op-build update 1-31-2017