FIX Integration problems
FIX Service and subservice in the Keystone plugin
FIX Some tests broken in the integration
FIX Add fiware service header