added more checks in .travis.yml
Merge remote-tracking branch 'origin/SLE-12-GA'

Conflicts:
	.travis.yml