Merge "Fix volume attach tests failing when using FIP as ssh method"