Merge pull request #11353 from kvuorine/fwknop-fixes