Manually finish the revert of datacouch_550.

[mikereiche]

The previous "Revert" only reverted CouchbaseTemplate resulting in compilation errors in master.

Closes #858

• You have read the Spring Data contribution guidelines.
• There is a ticket in the bug tracker for the project in our JIRA.
• You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
• You submit test cases (unit or integration tests) that back your changes.
• You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

[daschl]

merged into master