Merge branch 'realm-fixes' into 'master'

Fixes for default '<DEFUALT>' and blank '' realms



See merge request !422
3 jobs for master in 3 minutes and 13 seconds (queued for 3 seconds)