Merge pull request #106 from mchf/master

Do not remove firewall proposal from second stage when user modifies firewall settings.
Do not remove line from /etc/hosts if it contains two spaces. bnc#769081

Ported from SLE branch.
Updated testsuite for bnc#769081
Updated changelog.
Merge remote-tracking branch 'upstream/master'