Merge remote-tracking branch 'upstream/master' into ubi-workbench

Conflicts:
	lib/actuators_iot.js
	lib/rpc_actuators.js
Merge branch 'ubi-workbench' of https://github.com/TobyEalden/webinos-api-iot into ubi-workbench