Merge branch 'issue/1089-rename-key-hpp-to-key-locator-hpp'. Refs #1089.
http://redmine.named-data.net/issues/1089