Merge branch 'issue/1063-key-chain-compile-on-Ubuntu2' (second time). Refs #1063.
http://redmine.named-data.net/issues/1063