Sync with oslo-incubator

Remove deprecated gettextutils module.
Sync with oslo-incubator at commit
368daacaa3f4a65352f3e0c66a939a496c14ecca.

Adjust calls for modules that have moved:
cliutils.find_resource -> manilaclient.openstack.common.apiclient.utils

Closes-Bug: #1383179

Change-Id: I1f5750d0a5c3ed929b1c0cc13aa54bf05ee9bfb3
Merge "Sync with oslo-incubator"