Unskip cli-keystone catalog and help tests

Unskip tests which were skipped before pinning python-keyring to
not-faulty version as per bug 1193164.

This reverts commit 27e8547c31f15708b3ff143a62eb96742b287d26.

Change-Id: I1c4c4a509f4629eb8aeb1963e1c9623338d65453
Merge "Unskip cli-keystone catalog and help tests" into stable/grizzly