Merge proposals dependent on lp:~team-xbmc/xbmc/xbmc-test-helper

lp:~team-xbmc/xbmc/xbmc-test-helper has no merge proposals.