Merge "Improved generics on AbstractMasterSystemService / AbstractPerUserSystemService."