Fix for "Id" not working as Key Property

Small change to allow properties named "Id" or "PropertyNameId" to be identified as keys. This change will allow the same objects to be used client and server side (server allows "Id"). Change was made to not break any existing users. Any properties named "ID" will supersede any properties named "Id" thus preventing any breaking changes.