added missing dep
Merge branch '3.2' into 3.3
Merge branch '3.3'

Conflicts:
	extra/scripts/zentyal-unit-tests