Synced with latest version of code modified by Tom Klapiscak
Synced with latest version of code modified by Tom Klapiscak

ibm-watson-iot/iot-nodered,ibm-watson-iot/iot-nodered,ibm-messaging/iot-nodered,ibm-messaging/iot-nodered