Merge "Fixes bug 972673-Incorrect named parameters in BuildErrorException in test_volumes_list"