Merge "Return an error if apiVersion is 1.1+." into oc-dev