Merge proposals dependent on lp://qastaging/~alexlauni/webapps-applications/webapps-application-Tumblr

1. webapps-application-Tumblr
2. Dependent merge proposals