Include config.h from runtime-option.h
Merge pull request #2724 from simonwelsh/HHVM-3.1

Merge 8c2be2409258c4038b8a8424ca25c0fb352d592c into 3.1