BugLink: https://bugs.launchpad.net/bugs/1830176

...to match upstream. No functional changes.
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>