Add button hotkey info to the input panel tooltip text
Merge remote-tracking branch 'mozbugbox/tooltip-show-hotkey' into 1.6

Conflicts:
	engine/table.py