save new cluster only after metadata updates

Change-Id: Ic7688f0cdbc2b9d0ab9120179c36e2bf38dedc0b
Reviewed-on: http://review.couchbase.org/24372
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>