Update Oslo to 96d1f887dda Part 1

Oslo version 96d1f887dda21b43ba4376187f31953dee6f5273

This commit just injects fresh portion of code from Oslo
into Heat and fixes all the issues with new code

Partially implements blueprint oslo-db-support

Change-Id: I7e98c12ddf6689efc6ea6a4deab0b1c840297730
Merge "Update Oslo to 96d1f887dda Part 1"