Adhere to OpenStack import style

Since `oslo.concurrency` 0.3, import paths changed around and hacks in
place to support old versions can't handle the import style we were
using.

Work-around by using the proper OpenStack style.

Change-Id: Idd7625b01ba33168fcf7faaffcd9b3cc81d29a78