Differentiate between 404s for missing principal vs. missing org

Add a {"not_found": "principal"} or {"not_found": "org"} key-value
pair to the JSON body of the response, as appropriate.
Merge branch 'cm/principals-404'