add check for config-dir parameter (bug1101129)

Change-Id: I5cd454cc3c5bf5da9656c05e9a22385ffcd01147
Retry http_request and json_request failure.

Temporary network outages or keystone server restarts can lead
to a connection refused in auth_token middleware. Rather than
failing immediately, this patch attempts to retry a few times.

Fixes bug 1150299

(pulled from python-keystoneclient commit
9bb29b9dff4d220eaabf86cd286e651c5ae15b98)

Change-Id: I2ecf0d7745290976efcb3e3cd6511817a53d3e0a
Merge "Retry http_request and json_request failure." into stable/folsom
Merge "add check for config-dir parameter (bug1101129)" into stable/folsom
Allow ldaps self signed certs.
Fix bugs with set ldap password.