Bug 1033442 - Allocate slots from the zone explicitly; r=jonco

--HG--
extra : rebase_source : 7ffba7878873100b101c886f3f3f040065ccad3b