Add broken marker and move pytest.ini up one level
Change xfail to broken in OmeroFS
Change xfail to broken in OmeroPy
Allow MARK to be passed to all top-level test builds.
Exclude broken tests from Travis builds.
Merge remote-tracking branch 'origin/develop' into xfail-to-broken

Conflicts:
	components/tools/OmeroPy/test/integration/clitest/test_sessions.py
Merge pull request #3214 from ximenesuk/xfail-to-broken

Change xfail markers to broken