[development] Consolidating duplicate contrib modules for D7