avoid port clash with local postgis
modify test_identity to use new rx fixtures
Merge remote-tracking branch 'origin/master'