Backport of BaseOpenStackMockTest Updates

Backport of #365