Fix testr and keystoneclient requirements

Change-Id: Ica10b6f562d192c934a1cb998d3371399b7c6281