anchor.diff:  
       %% but we have a cleanup script, for existing system with 1.4.x or earlier
       %% DO cleanup here
  -    Res = rpc:call(CSNode, riak_cs_console, cleanup_orphan_multipart, []),
  -    lager:info("Result of cleanup_orphan_multipart: ~p~n", [Res]),
  +    case rpc:call(CSNode, riak_cs_console, cleanup_orphan_multipart, []) of
  +        {badrpc, Error} ->
  +            lager:error("cleanup_orphan_multipart error: ~p~n", [Error]),
  +            throw(Error);
  +        Res ->
  +            lager:info("Result of cleanup_orphan_multipart: ~p~n", [Res])
  +    end,
   
       %% list_keys here? wait for GC?
   
  
positive.code: 
      ok = verify_bucket_mpcleanup(UserConfig),
  
      ok = verify_bucket_mpcleanup_racecond_andfix(UserConfig, UserConfig1,
                                                   RiakNodes, hd(CSNodes)),
  
      pass.
  
  
negative.code:     ok.
  
  %% @doc in race condition: on delete_bucket
  verify_bucket_mpcleanup_racecond_and_fix(UserConfig, UserConfig1,
                                           RiakNodes, CSNode) ->
      Key = ?KEY_MP,
      Bucket = ?TEST_BUCKET,
      prepare_bucket_with_orphan_mp(Bucket, Key, UserConfig, RiakNodes),
  
      %% then fail on creation
      %%TODO: check fail fail fail => 500
  