Merge "Replace use of deprecated devstack option"