Merge "Harmonize how REST API handlers get a JSON body" into stable-2.15