Merge "StaticIpConfiguration: Couple of minor fixes"