revise thor and apollo clusters

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