Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev