Merge "Bump overlay version number." into oc-dev