Merge proposals dependent on lp://qastaging/~apachelogger/tomahawk/master

lp://qastaging/~apachelogger/tomahawk/master has no merge proposals.