Fixing a couple things in images / files
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/field_types/file/src/Pyro/FieldType/File.php
	system/cms/modules/streams_core/field_types/image/src/Pyro/FieldType/Image.php