Normalize :aot :all to :aot [:all].

This fixes type mismatch issues when merging profiles.

Fixes #1488.
Remove mention of :omit-default-repositories.

Fixes #1472.
Check for key not found message from gpg 2.x as well.

Fixes #1462.
Merge remote-tracking branch 'upstream/master'