merged -r691581 (MRM-915 and MRM-926: get the default guest users from redback config files instead of the hardcoded constant value) from trunk