Removing another used ssh key

In Amazon devenvs we run the Broker and Node on the same machine so there is no
reason to have this logic anymore.
Merge remote-tracking branch 'origin/enterprise-1.2' into enterprise-1.2.z