Allow multple GPG keys/keyrings to be specified, and also include them for the source repositories (deb-src lines). Also fix cases where we ended up with extra leading/trainling or double space character(s) between parts of the config line.
