Fix overriding pom variables due to nonescaped items.
Merge remote-tracking branch 'origin/master'