Verify invoking overridden static methods ends up calling correct method
See facebook/hhvm#1770
Adjust expected outcome
Merge branch 'master' into hhvm