prefer nnd:canonicalUrl to guid
Merge branch 'master' into RELEASE_20140325