Merge "Fixed bug when use_keystone parameter is False."