do not use mirrors for security repositories

Security updates should always be fetched directly from the security servers.
fixed merge conflicts
Merge branch 'kenyon-patch-1'