CRM-1909: Channel entity assign
   - fix migration issue
CRM-1915 Extend embedded forms creation in order
add extended
OEE-26: prepare backmerge with master
Merge remote-tracking branch 'origin/master' into feature/OEE-26_organizations

Conflicts:
	src/Oro/Bundle/TrackingBundle/Migrations/Schema/v1_2/OroTrackerBundle.php
OEE-26: backmerge with master
Merge remote-tracking branch 'origin/master' into feature/OEE-26_organizations
OEE-230: Process basic query parts
 - fixed bugs in Parser
 - fixed functional tests fixtures
Merge remote-tracking branch 'origin/feature/OEE-26_organizations' into ticket/OEE-304
BAP-3939: New Option Sets implementation. Reports. Backend
Merge remote-tracking branch 'remotes/dev/master'
BAP-3939: New Option Sets implementation. Reports. Update EntityFieldProvider to work with enums
BAP-3939: New Option Sets implementation. Reports. Fix issues with ignore logic
BAP-3939: New Option Sets implementation. Reports. Frontend
BAP-3939: New Option Sets implementation. Reports. Frontend
BAP-3939: New Option Sets implementation. Reports. Frontend
BAP-3939: New Option Sets implementation. Reports. Fix filters
BAP-3939: New Option Sets implementation. Reports. Fix export grid with multiEnum
Merge branch 'master' of github.com:laboro/platform into feature/OEE-141_add_elastic_search_support
BAP-498: Investigate failed builds
 -  CR changes
OEE-230: Process basic query parts
 - updated functional test for advances search