Merge branch 'develop' into imported-magento-magento2-functional-testing-framework-865

Author: jilu1