Merge remote-tracking branch 'origin/develop' into feature/cron-command

# Conflicts:
#	src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Author: lbajsarowicz