us #2295 and 2296, remove guest and add /maestro vhost

Change-Id: I3a522ca29f0a52df5b9549361c2012cdd976302c