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)
Status Job ID Name Coverage
  Quality
passed #524
code-quality

00:00:32

 
  Tests
passed #525
make-test

00:01:50

50.5%
 
  Install
passed #526
make-install

00:00:49