Sync oslo lockutils for "fix lockutils.lock() to make it thread-safe"

Pull in oslo-incubator change Ia18e6e9f "fix lockutils.lock() to make it
thread-safe" along with dependencies.

Note: I've intentionally excluded log.py from the sync since it pulls in
Change Ic2cf3e52: Adding domain to context and log which is (1) unrelated
to the lockutils change and (2) also changes context.py, which lockutils
does not depend on.

Changes by module (from oldest to newest)
=========================================

excutils:

Change Ic36fa050: Enable H302 hacking check
Change Ibf3c56e4: BaseException.message is deprecated since Python 2.6
Change I87fd89ff: excutils: use six.reraise to re-raise
Change If640e551: excutils: replace unicode by six.u
Change Ic6f0c0ef: Remove vim header

fileutils:

Change Ia51d416b: Add utils for creating tempfile
Change Ic6f0c0ef: Remove vim header

gettextutils:

Change Ic6f0c0ef: Remove vim header

importutils:

Change Ic6f0c0ef: Remove vim header

jsonutils:

Change Ic6f0c0ef: Remove vim header
Change I90be8797: Use six.iteritems to make dict work on Python2/3

local:

Change Ic6f0c0ef: Remove vim header

lockutils:

Change I64fccddc: Allow lockutils to get lock_path conf from envvar
Change I9e1260e2: Add main() to lockutils that creates temp dir
Change Ia18e6e9f: fix lockutils.lock() to make it thread-safe
Change Ic6f0c0ef: Remove vim header

timeutils:

Change I397bae40: Add helper method total_seconds in timeutils.py
Change Ic6f0c0ef: Remove vim header

Related-Bug: #1065529

Change-Id: Ia3530c0d3e78d90fd6de8ac186b252e0fbbba85e
Merge "Sync oslo lockutils for "fix lockutils.lock() to make it thread-safe""
Updated from global requirements

(Also add the sphinx issue which wasn't in the automatic job and
blocked this from landing.)

Change-Id: I94bc14b0ce448ea7a103a6faab73c29b38fbdf3d
Merge "Updated from global requirements"