MSC2 services API cleanup (WIP)

It was updated to be in sync. with current 2.x upstream.