21224 - Merge in some of Travis's staged REST changes.