Converted comment, term and custom block bundles to entity reference.

See https://drupal.org/node/2181593