Merge proposals dependent on lp://qastaging/~vrruiz/webapps-applications/makecheck-dependencies

1. makecheck-dependencies
2. Dependent merge proposals