fix #227, fix #228 Machine Demo - Redis query optimization, client cache for chart data
Merge remote-tracking branch 'upstream/0.8.6-migration' into machine2