Remove extras dependency with a partial oslo sync.

Only service.py and importutils.py have been synchronized.

This change is a blocker for producing g-2 rpms

Change-Id: I692a8f6c9948a7aa75a2f6db7657d6c72e09a772