[doctrine] escape reserver words manually.
Merge branch '0.4'