Take three fix attempt for OpenStack bug 1604912 https://bugs.launchpad.net/bugs/1604912
Take three fix attempt for OpenStack bug 1604912
https://bugs.launchpad.net/bugs/1604912

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