Fixed profile inheritance with a new patch and removed file_entity patch that makes the profile crash on make

This is the error message we receive from the site-install process on file_entity patch.

> file_entity-7.x-2.x-dev downloaded.                                                                    [ok]
> Unable to patch file_entity with file_entity_remove_file_display_alter_2067909_10.patch.            [error]