Apply patch 2363693-1

* several fatal error when an entity content generated is referenced
  from an other entity, or an entity content is referencing other entity
* Drupal Issue: https://www.drupal.org/node/2363693
Merge pull request #227 from jmolivas/Issue-2363693

Apply patch 2363693-1