Refresh/re-establish separate domain SID

@rev aballard@
@bug W-2340693@
Merging origin/dchasman/master-pending-integrateSeparateDomainSupportFix into master