Ack this two-patch set: LP# 1570441 appears to be the same bug as reported, fixed, and tested upstream; Simple patches; clean cherry-picks. Acked-by: Kamal Mostafa <kamal at canonical.com>