CLDSVCS-476 Don't use BooleanOption as it always return true if option exists
Revert "CLDSVCS-476 Don't use BooleanOption as it always return true if option exists"

This reverts commit 7fda31f5593d60f6ad5ab4023d4585f296496983.
CLDSVCS-476 Just pass in a default