Moved number of disks exception into validators

Change-Id: Ie95dacd1ece3425c946af9922722ca07f022a260
Merge "Moved number of disks exception into validators" into 3.2-fixes