AID-11 Fixed check for amedia realm in canonical_domain.
Merge branch 'master' of github.com:amedia/checkpoint