Simplify MethodDefinitionFactory by removing PageDefinitionFactory dependency
Merge branch 'master' into php