sync Oslo Grizzly stable branch with Quantum

fixes bug 1154393

Change-Id: I3442ff3da05447926b3e5882299ec7a92b9e38e3