fix #235, fix #236, fix #237, fix #238 instant reload, load indicator, server polling stat, empty chart options
Merge remote-tracking branch 'upstream/0.8.6-migration' into machine2