Merge pull request #2021 from lfiebach/openelec-settings

Some vpnd patches to prevent vpnd exit and better support for .config fi...