skip pdf conversion tests if soffice isn't running
test on 1.9.3 for now
another 2 tests that rely on soffice running and need to check first
parallel (unit, integration, functional ) tests
merge upstream
Merge branch 'virtual-liver' into vln-merge

Conflicts:
	.travis.yml
	test/functional/content_blobs_controller_test.rb