Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev