Merge commit 'ec4087d' into unstable

Change-Id: I51759ce9b61aaef5ddfa4b29775f654f69e65cb9
Revert "querycmd: Discover indexer ports from cluster address"

This reverts commit 31f6cb9a6f30f43d1080205a982425bb7629d4b3.

Change-Id: I02467643e18ab0d25a87c85fea21813ac48f6e42
dataport: improved log messages.

Change-Id: Id1d771e986acd86e77a86c44b2a50d58a13f6bbc
CBIDXT-291: integrate projector with cluster_info.

- bugfixes from rebalance script.
- improved log messages.

Change-Id: I9f0f4843d5aac9268636df0faacd69caedf3ceae
json docs test data.

Change-Id: I2543903499c6c1ebeabb858cc37a1a2c4d8e0e0b
Add a switch in loadgen to accept production file.

Change-Id: I784a86454c1eed33dc5261f6defbd26adf6efbd6
Benchmark N1QL evaluation.

Change-Id: I6c152abb2c10e9d966528ad87a6baca851aed131
N1QL Integration: Adjusting port address.

- bugfix: add bucketname into secondaryIndex{} structure.
- fix log messages.

Change-Id: I85526ce8fa3404c501f67a5e58487e3feca8f16d
N1QL-ScanCoord: Send empty array instead of null.

Change-Id: Ie4f6d7c101ce39434567cfc51280d6b9d4f7feb3
Merge branch 'unstable'

Change-Id: I9217e19a8a9e79aa5242af913d9d3ff3ca48f741