Updated TODO [ci skip]
Added workaround for some HHVM bug. No functional change intended
HHVM workaround for https://github.com/facebook/hhvm/issues/1989
Updated TemplateChecks tests for better HHVM compatibility