[z1856] Cleanup some battleground related code based on master

(cleaned version of 5677b6d)

(based on commit [s1418] - 7d8fb56)