Fix merge issue between memcached redundancy use of --finish and quiescing use of --finish