Merge "Services: Convert BlockManager's static to a const now HHVM is gone" into...