zbx-1475-hamap branch, rev 8856.

there's a minor issue with map labels - they now have excess whitespace at the bottom. this was introduced in revision r8807