Emoncms V9.9.6 Stable merge (pre-merge check)

@borpin @Greebo I think it would be a good idea if we go forward with this v9.9.6 merge, the discussed changes to service-runner or associated emoncms calls can be updated at a later stage. The automated update process would at this point still be aimed at emonSD users. I think there is more work required to reach a point where clicking the update button on the UI works for custom installations - we can review and test these separately. I’ve tested the update on a emonpi here again and it all goes smoothly.

Test procedure:

SSH into stock EmonPi running emonSD-30Oct18

cd emonpi
git pull
git checkout service_correction
cd /var/www/emoncms
git checkout master

Then I login to the EmonPi, navigate to admin and running emonpi update.