oslo sync apiclient and cliutils

Generated with:
 ./update.sh --base novaclient --config-file
../python-novaclient/openstack-common.conf --dest-dir
../python-novaclient/

Synced patches:

apiclient:
  04a1abe Revert "Removed set_loaded() method from Resource class"
  5e76477 Merge "Handle 300 status code in common HTTPClient"
  492fe2c Merge "py3kcompat: remove"
  466ad64 Merge "Fix usage of dict.keys in apiclient.exceptions"
  8630a44 Merge "Removed set_loaded() method from Resource class"
  41fbfea Merge "Add to_dict() method to apiclient Resource"
  6650435 Fix usage of dict.keys in apiclient.exceptions
  35dc1d7 py3kcompat: remove
  9f1e7eb Correct docstring in load_plugin_from_args
  0c4d2c7 Removed set_loaded() method from Resource class
  3b248dd Add to_dict() method to apiclient Resource
  71c22e9 Handle 300 status code in common HTTPClient

cliutils:
  9a7f2f8 Merge "Deleted duplicated method in cliutils."
  8f2effd Use `six.text_type` instead of `str` in cliutils
  885828a Deleted duplicated method in cliutils.
  71a2d90 Add common methods to cliutils

Change-Id: I0c8849d8d5dd71f34aa5dbcd2c0875c164706d70
Merge "oslo sync apiclient and cliutils"