(bug 62211) Refactoring EditEntity to use EntityStore

This attempts to remove any hard coded dependencies
on EntityContent from EditEntity.

Change-Id: Ieb3be710c6a9e952ce4c2c40e3d89632a51836a2