Revert "Revert "CBQE-1432 - Automate test cases in cbcollectinfo test plan (xdcr and views).""

This reverts commit 4f4831ab010390f7a37b15169cf087df90e98cf0.

Again applying the merge fix.

Change-Id: Icdb64cb91ffaf02031f1d04e55c0515d00abbc92
Reviewed-on: http://review.couchbase.org/31129
Reviewed-by: Shashank Gupta1 <shashank.gupta1@globallogic.com>
Tested-by: Shashank Gupta1 <shashank.gupta1@globallogic.com>