Make entity lookups by id honor the specified entity type#1401

eric-maynard merged 2 commits intoapache:mainapache/polaris:mainfrom

adutra:fix-entity-lookup-by-idadutra/polaris:fix-entity-lookup-by-idCopy head branch name to clipboard