Moved ServicePriority to RI,
adapted SPI channge in ServiceProvider.