Using a relative path to an image in a <poweredBy><logo> generates a wrong "src" value for HTML <img> tag

This happens only when a <bannerLeft> or <bannerRight> is also used.
Then the logo image becomes the same than the banner image.
(see attached site.xml)

This problem comes from default-site.vm in poweredByLOgo macro:
in calculation of relative path of $img code is following
#set ( $img = $src.replaceAll( '
', '/' ) )
But should be following
#set ( $img = $img.replaceAll( '
', '/' ) )

Please see proposed patch in attachment.