Merge "Update dependency versions for 2017-05 samples release" into oc-dev