TRUNK-3478

Contains all changes required for TRUNK-3478. Unfortunately, this pull request also contains an unchanged version of the checkstyle.xml file. I did not make any changes to this file, but unfortunately it seems to have slipped through :-(

Is it ok to have this file included in the pull, or do you want me to re-submit a cleaner one ? I've decided not to make any further changes to it right now in case there are any review comments :-)