[FIX] Partially revert xmo@openerp.com-20130812074509-yopeb4pxtsads4d9

[FIX] Partially revert xmo@openerp.com-20130812074509-yopeb4pxtsads4d9

Change attempted to simplify branding distribution, but based node
branding on final view. To be able to rewrite, node branding must be
based on source views positions before applying inheritance.

Reintroduce manual generation of xpath in distribute_branding as
ElementTree.getpath() can't handle it.

Note: why isn't branding distribution performed during initial views
reading (e.g. inherit_branding)? Surely that would obviate the need
for special casing and manually creating paths no?

bzr revid: xmo@openerp.com-20130919130847-3t8zfpv9m9pcibg0