Merge pull request #317 from chadlung/master

Updating to latest OpenStack.Common