NuCivic/nucivic-internal#58 Updating entity_token patch
Merge pull request #58 from NuCivic/entity_module_patch

Implementing patch #2341611 for entity module