Merge pull request #880 from op-jenkins/op_update_1821_2-17-2017

op-build update 2-17-2017