Add BlockStorage and SwiftStorage nodes into hosts

With this we populate the hosts key (needed for /etc/hosts editing)
with the BlockStorage and SwiftStorage nodes too.

Change-Id: I6730ffe1e27d952d563c16a9480298fbef9f61fe
Merge "Add BlockStorage and SwiftStorage nodes into hosts"