Rebase mdap-rc1 with upstream updates

[coveralls]

Pull Request Test Coverage Report for Build 1843

• 0 of 15 (0.0%) changed or added relevant lines in 6 files are covered.
• 4318 unchanged lines in 9 files lost coverage.
• Overall coverage decreased (-0.05%) to 26.641%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
app/multitenant/aws_collector.go	0	2	0.0%
app/multitenant/memcache_client.go	0	2	0.0%
app/multitenant/s3_client.go	0	2	0.0%
app/multitenant/sqs_control_router.go	0	2	0.0%
prog/app.go	0	3	0.0%
probe/probe.go	0	4	0.0%
<!--	Total:	0	15	0.0%	-->

Files with Coverage Reduction	New Missed Lines	%
app/multitenant/consul_client.go	2	52.88%
app/multitenant/sqs_control_router.go	2	0.0%
app/multitenant/consul_pipe_router.go	2	78.39%
app/multitenant/s3_client.go	2	0.0%
prog/app.go	3	0.0%
app/multitenant/memcache_client.go	4	0.0%
app/multitenant/aws_collector.go	10	0.0%
render/detailed/detailed.codecgen.go	1622	28.93%
report/report.codecgen.go	2671	34.9%
<!--	Total:	4318		-->

Totals
Change from base Build 1807:	-0.05%
Covered Lines:	14845
Relevant Lines:	55722

---

💛 - Coveralls