Merge conflict in file_entity_add_upload_alter
#1754: Images resized in wysiwyg will stay that size in node.
Merge pull request #1952 from openscholar/1754-media_workflow

Remove extra steps in file upload