fixed conflicts after merging with trunk with 787
fixed conflicts after merging with trunk with 787
zancas/hacking,openstack-dev/hacking,openstack-dev/hacking,emonty/oslo-hacking,emonty/oslo-hacking,hyakuhei/cleantox,hyakuhei/cleantox,zancas/hacking