Various updates to hhvm 9999 to keep up with building master