don't rely on RMI being available for testing the poller frontend
Merge branch '1.12'
Merge branch 'master' into pull-requests