Better token filtering in LayeredParser (for native xml problem in SCL-5162 {Play 2 Scala Template: Some false positive errors} ) (cherry-picked)
Merge remote-tracking branch 'origin/master.release' into master.release