Update to released versions of entity and entityapi