Merge "Fixed warning on getWebDomain()" into oc-mr1-dev