add yaml blueprint for couchbase and some minor cleanups
Addressed @aledsage's comments on @ahgittin's PR #1468
Merge pull request #1470 from Nakomis/couchbase-tidies

Couchbase tidies