Fix rollback
Fix rollback

First the data was not actually being staged in the rollback area.
Secondly, there wasn't an assurance that the disk wouldn't have rollback
committed...

xcat2/confluent,whowutwut/confluent,xcat2/confluent,xcat2/confluent,jjohnson42/confluent,whowutwut/confluent,jjohnson42/confluent,jjohnson42/confluent,xcat2/confluent,xcat2/confluent,whowutwut/confluent,jjohnson42/confluent,whowutwut/confluent,jjohnson42/confluent