Mark failing python tests

This is a rebase of gh-1629  and gh-1678 onto develop.

--rebased-from #1629
--rebased-from #1678

See gh-1629 for testing, however, there may still be some intermittent failing tests to identify so having this PR open for a day or two would be no bad thing.