Rename PropertyInfo to more generic EntityInfo

This is a direct follow-up to patch
I912882b09d302f8c74b1138b1aa3ab807d19f094. Yes, I messed that up
by choosing the wrong name. Don't ask. ;-)

Change-Id: I46bdbd049521e10f8cb7a9bfbf13ad3ad96302f5
Merge "Rename PropertyInfo to more generic EntityInfo"