Updated apache commons collections to 4.  Started work on fix for DB-generated keys