Merge "Fixing web-power-switch address on demo-pod configs"