Merge proposals dependent on lp:~timo-jyrinki/pay-ui/stop_depending_on_transitional_packages

1. stop_depending_on_transitional_packages
2. Dependent merge proposals