BUG-3675 Support non-prefixed identityrefs in config subsystem