Fix 933822

Hi @jandd and @onovy,

This PR fixes bug #933822. Please see changelog for more info. The piuparts failure:

1m6.9s ERROR: FAIL: Package purging left files on system:
  /etc/bash_completion.d/        not owned

is unrelated to these commits, but it seems like it ought to be fixed up for the next upload.

Cheers, Nicholas