Adding DevStack Support

Change-Id: Iacdf5d3c78a613437de3e472e8e1a781fe3db5a4
Merge "Adding DevStack Support"