remap keys to ones that don't have conflict fixes #963

Signed-off-by: Gregory Amerson <gregory.amerson@liferay.com>
Merge pull request #965 from gamerson/master

remap keys to ones that don't have conflict