Merge "yang model: add service provider feature model"