Merge proposals dependent on lp://qastaging/~abreu-alexandre/webapps-applications/simplify-local-debugging-argument

1. simplify-local-debugging-argument
2. Dependent merge proposals