Fix discover command failed to discover keystone in ssl

Fix the blocking behavior of keystone discover when trying
to obtain information of the local keystone. It does not
block while checking and checks both protocols HTTP and HTTPS

Change-Id: I43616a348bf04163bf7967a12957556d7edfde40
Closes-Bug: #1270154
Merge "Fix discover command failed to discover keystone in ssl"