Upgrade Commons Collections to 4.0 and remove deprecated SynchronizedMap