Fix: Checkstyle
Fix: Ignore vagrant dir into CI

Conflicts:
	.travis.yml
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	.travis.yml
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	.travis.yml