OE-3606 - consolidated up to 1.4 release ,130914_000004
[OE-3606] - consolidated up to 1.4 release ,130914_000004, removing duplicate foreign check disabling
Merge branch 'develop' into jira/3606
[OE-3606] Fix migration consolidation