edly hawthorn version#6

Ayub-Khan wants to merge 2 commits intohawthornedly-io/devstack:hawthornfrom

edly/hedly-io/devstack:edly/hCopy head branch name to clipboard