Merge "getConnectionInfo should take calling package name as argument" into oc-mr1-dev