Brought SFX in line with changes to cedilla_service_commons