fixes #2263 Selected compute resource provider does not remain selected on failure

Will rebase when 3.2 is merged