Merge "BUG-1866: sal-compatibility does not register some services"