BAP-4460: attachment config
Merge remote-tracking branch 'origin/master' into feature/BAP-4360_attachments_management

Conflicts:
	src/Oro/Bundle/AttachmentBundle/Tools/AttachmentEntityConfigDumperExtension.php
	src/Oro/Bundle/NoteBundle/Entity/Manager/NoteManager.php
	src/Oro/Bundle/UserBundle/Resources/config/services.yml
Merge remote-tracking branch 'origin/master' into feature/BAP-4360_attachments_management

Conflicts:
	src/Oro/Bundle/EntityExtendBundle/EventListener/DoctrineListener.php
Merge remote-tracking branch 'origin/feature/BAP-3978_activity' into feature/BAP-4360_attachments_management

Conflicts:
	src/Oro/Bundle/AttachmentBundle/Tools/AttachmentEntityConfigDumperExtension.php
	src/Oro/Bundle/EntityExtendBundle/EventListener/DoctrineListener.php
	src/Oro/Bundle/EntityExtendBundle/Tools/RelationBuilder.php
	src/Oro/Bundle/NoteBundle/Entity/Manager/NoteManager.php
	src/Oro/Bundle/UserBundle/Resources/config/services.yml
Merge remote-tracking branch 'origin/feature/BAP-4360_attachments_management' into ticket/BAP-4460
BAP-4460: config & generator extensions
BAP-4460: config & generator extensions
Merge pull request #2106 from laboro/ticket/BAP-4460

Ticket/bap 4460
BAP-4460: config & generator extensions
Merge pull request #2108 from laboro/ticket/BAP-4460

BAP-4460: config & generator extensions
BAP-4460: config & generator extensions
Merge pull request #2110 from laboro/ticket/BAP-4460

BAP-4460: config & generator extensions
BAP-4466: Attachments grid
Merge pull request #2112 from laboro/task/BAP-4466

BAP-4466: Attachments grid
BAP-4466: Attachments grid
BAP-4360: Merge remote-tracking branch 'remotes/origin/master' into feature/BAP-4360_attachments_management

Conflicts:
	src/Oro/Bundle/AttachmentBundle/Entity/Attachment.php
BAP-4360: Merge remote-tracking branch 'remotes/origin/master' into feature/BAP-4360_attachments_management

Conflicts:
	src/Oro/Bundle/AttachmentBundle/Resources/translations/messages.en.yml
BAP-4360: Merge remote-tracking branch 'remotes/origin/feature/BAP-4360_attachments_management' into task/BAP-4360-merge-master

Conflicts:
	src/Oro/Bundle/AttachmentBundle/Entity/File.php
	src/Oro/Bundle/AttachmentBundle/Resources/config/services.yml
	src/Oro/Bundle/AttachmentBundle/Resources/translations/messages.en.yml
	src/Oro/Bundle/EntityExtendBundle/ORM/RelationMetadataBuilder.php
BAP-4360: Merge master
Merge pull request #2120 from laboro/task/BAP-4360-merge-master

Task/bap 4360 merge master