merging dsetia/devstack into rajreddy/devstack