locked devstack into stable/folsom branch