Add has_su_daemon necessary for Superuser
Fix embedded Superuser
Sync with local changes