Fix whitespace issues
Removed invalid DCA config options
Added documentation about onversion_ and onrestore_callbacks
Merge branch '2.11' into 3.0