Merge "Fix test_server_software_config scenario test"