Feanil/fix bokchoy

@jzoldak This should un-break bok-choy tests on devstack.