Merge branch '5.4.0-develop' into 1263-Possibility-to-add-second-code-source-directory-for-modules-local-composer-development-using-content-root-feature-tests

Author: vitaliyboykocontributor