CBLT-298:  remove "branch" GITSPEC parameter, as it's not needed.
           Changed some varialbe names, and other formatting.

Change-Id: Ia1a822a51c889de61504e9b70be3ddce491fc7e2
Reviewed-on: http://review.couchbase.org/37531
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>