Merge "Check for sidecar null-ness before removing" into oc-dev