[fixed]GuildHall no longer needs to be redeeded to recretate - mantis
4336 - not retro

Change-Id: I74ee272f78a2a4ccfc7e4ae39ec21fbc36d23094
Merge "[fixed]GuildHall no longer needs to be redeeded to recretate - mantis 4336 - not retro" into unstable