PHP renderer generator: changed the namespace declaration syntax
Moved templates' predicates' normalization to TemplateCollection
Tweaked some test data. No functional change intended
Synced from master
Synced from master