catch a MatchError on json-handling complex Map types
Merge branch 'scala-2.11-akka-2.3.2-migration' into merge-migration-to-clusterconfig