.travis.yml: Use OCA version of maintainer-quality-tools
Merge branch '7.0' into 8.0-fix-travis

Conflicts:
	.travis.yml