Merge pull request #3276 from ktsaou/master

apps.plugin freebsd fixes;