Merge proposals dependent on lp:~cspotcode/gg2garrisonbuilder/v2.1_compilant

lp:~cspotcode/gg2garrisonbuilder/v2.1_compilant has no merge proposals.