by slashrsm: Remove 'fieldable' key from entity annotation - drupal.org/node/2346455.
Merge branch '8.x-1.x' of github.com:drupal-media/media_entity into 8.x-1.x