Backport last version of Iba1105bc119272715fa211ac129a366fe50cbf47
Backport last version of Iba1105bc119272715fa211ac129a366fe50cbf47

from upstream.

Change-Id: Icdc214ce794e8d608ce51eab77f7fa5c4a1a4526
Closes-bug: #1511755
Closes-bug: #1512021
Related-bug: #1508511
xarses/fuel-library,xarses/fuel-library,ddepaoli3/fuel-library-dev,stackforge/fuel-library,ddepaoli3/fuel-library-dev,xarses/fuel-library,ddepaoli3/fuel-library-dev,stackforge/fuel-library,huntxu/fuel-library,ddepaoli3/fuel-library-dev,ddepaoli3/fuel-library-dev,xarses/fuel-library,huntxu/fuel-library,huntxu/fuel-library,eayunstack/fuel-library,huntxu/fuel-library,eayunstack/fuel-library,eayunstack/fuel-library,stackforge/fuel-library,stackforge/fuel-library,huntxu/fuel-library,eayunstack/fuel-library,eayunstack/fuel-library