Merge branch 'issue/1088-remove-certificate-version-in-key-locator-name'. Refs #1088.
http://redmine.named-data.net/issues/1088