ufsd: Fixed and cleaned up 4887 merge
Merge branch 'master' of github.com:RMerl/asuswrt-merlin