allow oracle to be forced

Change-Id: I9b830be17c02794c11d9a15e9fc6c8ec0b0a9df0
Merge "allow oracle to be forced" into lp5.0