Merge proposals dependent on lp://staging/~tpeeters/ubuntu-sdk-tools/fix-help

lp://staging/~tpeeters/ubuntu-sdk-tools/fix-help has no merge proposals.