Merge pull request #9625 from jedp/v1.0.1

Bug 863417 - toolkit.identity.uri pref; resolved conflicts from v1-train