Updating to latest masters

Deployed new service (3bcfaa00595c8b331175577286733030328d146b):
* Limit memory usage during directory clean up.
* Don't halt gc if a directory is bad.

Change-Id: I83943cb05f93e3c2c46c210abbf3a047dc5101e3
Merge branch 'master' into wmf-deploy

Change-Id: I312eabc1e02eb62adfb999fc352ecff62ce9a19c