xbsv currently requires NumberOfMasters to be defined unless it is 1

Change-Id: I2c83c64b56a8d2469eb3c24ffaaa2cc24e6ebf4b