Adding phpunit to requires in composer
Merge remote-tracking branch 'primary/master' into feature-elastic-ds

Conflicts:
	composer.lock