Update sufia and hydra-collections to newest commits, removes duplicate code: refs #3733, #3780