CRM-2173 PYP: Customer import falls down with "The EntityManager is closed"
   - fix issues with closed EM after DB error
CRM-2173: PYP: Customer import falls down with "The EntityManager is closed"
   - code style fixes
CRM-2173 PYP: Customer import falls down with "The EntityManager is clos
   - rollback changes, moved to akeneo bundle
CRM-2173: PYP: Customer import falls down with "The EntityManager is closed"
   - migrate to latest AkeneoBatchBundle version
Merge branch 'master' into ticket/CRM-2173
Merge branch 'master' into ticket/CRM-2173
CRM-2282: Fix spelling for short Okay
CRM-2282: Fix spelling for short Okay.
- fixed translations
Merge branch 'master' into fix/CRM-2282_fix_spelling_OK

Conflicts:
	src/Oro/Bundle/UIBundle/Resources/public/js/modal.js
CRM-2232: Could not open current User's view after its email was changed
    - fix issue with outdated owner in activity
    - fix TODO
BAP-6647: Doctrine Array collection of enums after post request dissapear from context
CRM-2291: Show events and calendars colors as squares
Merge pull request #3279 from laboro/fix/CRM-2282_fix_spelling_OK

CRM-2282: Fix spelling for short Okay
BAP-6544: Upgrade to latest master fails with Calendars Events
- added dependency to data fixture
Merge branch 'master' into bug/BAP-6647

Conflicts:
	UPGRADE-1.5.md
Merge pull request #3286 from laboro/fix/BAP-6544

BAP-6544: Upgrade to latest master fails with Calendars Events
CRM-2232: Could not open current User's view after its email was changed
   - update unit tests
   - minor code style fixes
CRM-2232: Could not open current User's view after its email was changed
    - minor fixes
CRM-2292: Unexpected border on "Calendar context menu" in FF and IE
Merge pull request #3289 from laboro/fix/CRM-2292_unexpected_border

CRM-2292: Unexpected border on "Calendar context menu" in FF and IE