Auto merge of #2755 - Turbo87:keyboard-and-modifier, r=locks

Update ember-keyboard and ember-modifier

This PR is a combination of #2754 and #2698 to make our dependency linter happy :)

r? `@locks`

Author: bors