Bug 1106 : Kill processes still running after join call timeout reached, also...

Bug 1106 : Kill processes still running after join call timeout reached, also timeouts added to nova and keystone clients. Join timeout increased from 10 to 20

Change-Id: I9fce3b4c4322d717a93207d9c34136ba75108a3e
Signed-off-by: bravof <fbravo@whitestack.com>
(cherry picked from commit d9e56359)