Take 2 fix attempt for OpenStack bug 1636150 https://bugs.launchpad.net/bugs/1636150
Take 2 fix attempt for OpenStack bug 1636150
https://bugs.launchpad.net/bugs/1636150

MartinPaulo/faafo,MartinPaulo/faafo,MartinPaulo/son_of_faafo,MartinPaulo/faafo,MartinPaulo/son_of_faafo,MartinPaulo/son_of_faafo