Fix typos in imports

Change-Id: Ib45cbaf03baaa360e6126fef49401885f71bb893
Remove oslo.storage

Change-Id: I4dd25fcf8d6e2eac2ac4e4d7fc51c7edb3234c88