Added ability to disable hardware keys.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
Merge remote-tracking branch 'baked/jb-4.2' into jb-4.2