Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	Vagrantfile

Merge with VCCW 2.19.0

Merge with VCCW 2.18.0

Update version notation in composer.json

Change default value of overwrite_htaccess to true

Merged with VCCW 2.17.0

vccw-team/vccw@2.14.0...2.17.0

Cleanup around composer

Merged with VCCW 2.13.0

vccw-team/vccw@2.11.0...2.13.0

Merged with VCCW 2.11.0

vccw-team/vccw@2.8.0...2.11.0

+ Merged with VCCW 2.8.0

+ Bugfix around multisite