Rebuild changes in bfv v1

* Adding additional disk size check for rebuild it was missing before
* Changing size CBS bootable volume param because of downstream change in CBS code

Change-Id: Iac6ef89c98585902492c4b285b037f1aac1e7e87
Merge "Rebuild changes in bfv v1"