Ported pluggable-sysauth branch to master
Ported pluggable-sysauth branch to master