Merge pull request #1198 from ably/AIT-453/map-clear #1719

Job	Run time
check-rest-okhttp	7m 37s
check-liveobjects	3m 15s
check-realtime-httpurlconnection	32m 22s
check-rest-httpurlconnection	5m 26s
check-realtime-okhttp	31m 34s
	1h 20m 14s

Provide feedback