Merge proposals dependent on lp://staging/~rsalveti/libunity-webapps/control_add_multiarch_support

1. control_add_multiarch_support
2. Dependent merge proposals