master: fix ntp.conf config merging: do reread the config from disk (bnc#773201)

This is a first merge of the Code-11 branches into master (before, the fixes were ported from SLE11 to master via svnmerge). Therefore, seemingly there are many commits to review, but in fact the diff is small, corresponding to the already reviewed PRs #2 and #3.