Improve controller data handling

- Only set the data in the request for 'model' controllers
- Make sure to clear the request data first.
Merge remote-tracking branch 'origin/develop' into feature/444-varnish