Merge proposals dependent on lp:~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import-dict-config

1. rt-61147-nagios-sca-import-dict-config
2. Dependent merge proposals