Merge "Do not create Map subclasses"
drwxr-xr-x - opendaylight