MB-100:cbcollect_info: correctly compute installation root

initargs is normally %(root)/var/lib/couchbase/initargs

which is 4 levels above root, not 2 as I previously did

Change-Id: I4ed931de147353de310ed2e045bffcc34c7dce84
Reviewed-on: http://review.couchbase.org/26393
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
MB-8309: bump ebucketmigrator's TERMINATE_TIMEOUT

So that it more or less matches other recently bumped timeouts.

As part of investigating MB-8309 we saw that we were hitting this
timeouts in initial phase of old-style vbucket filter change.

Our thinking is this timeouts is indeed needed but given other
timeouts were bumped and this one did not, we just need to bump this
one.

Change-Id: Ia8e02a211a094cca87ac866d341d425277247f88
Reviewed-on: http://review.couchbase.org/26416
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
Merge remote-tracking branch 'origin/2.0.2'

* origin/2.0.2:
  MB-8309: bump ebucketmigrator's TERMINATE_TIMEOUT
  MB-100:cbcollect_info: correctly compute installation root

merge is trivial

Change-Id: Id446b8c50124cc5a450b8379e326ed5f2d2e9eec