Fix for bugs in the multi-platform code changes.
Update broker and node tests.

Change-Id: Ic8b0397a85d1b1c27c4010caa302fb7759ffc670