Refactor support for properties on entity managers and queries.

Change-Id: Ia99a56de75d873a3771f37cdafc774803d6ffc3e