Add support for middlewares with hyphens

Change-Id: I1142270f76285190b600da759753011331a85909
Closes-bug: #1278950
(cherry picked from commit af45e4200ecc26fc34df2f785b79eb89426bd69b)
Havana: Fixtures: fix keystone branch name

Solve issue: « fatal: ambiguous argument 'stable/havana': unknown
revision or path not in the working tree. »

Change-Id: I829b24ac8f9cffa0aae8cbaf8cedac3714a87dfb
Merge "Havana: Fixtures: fix keystone branch name" into stable/havana