Merge "The adoption test should not depend on the iscsi deploy"