Correct the entity escaping and restore parsoid data attribute

Change-Id: I98acc13222de73832d6607c057fe67f82160a3bd
Merge "Correct the entity escaping and restore parsoid data attribute"