Merge "Remove duplicated section definition clients_keystone"