updatd entity_store with latest portability patch
migrated to master branch of entity_store