REVIEW-5008: Update spec based on updates to ‘unified configuration model’ spec