Added add_role()/remove_role() to osclient.keystone.UserManager.
Added timeout parameters to wait_for_*() in sample.