Merge branch 'hotfix/fixes-for-ci'
- composer self update fix
Merge branch 'hotfix/composer-travis-update-fix' into develop