PLAT-5844
Checkstyle
Remove unused class
PLAT-5000 - Enable JDK 8 compatibility

Remove Map interface from Map2
Fix Mockito issue
Reviewed-by: cjkent