Make --force a boolean flag

Previously it would require a meaningless argument.

Change-Id: I1076102dcf819c819a729a441833442d95a20694