Remove ControllerDescriptor 

ControllerDescriptor turned out to be vestigial and caused confusion with developers trying to stick extra features on it.

This PR also fixes ControllerActionDescriptor to pick the right type for the display name.