Fix for a server name for agent-2 for waterloo node
Merge branch 'silver' of https://github.com/savi-dev/devstack into silver