Merge "Fix HHVM RepoAuthorative mode again"