Merge "Fix MSB services be independent of release name"