forked from CM

* add SUPERUSER_PACKAGE_PREFIX in prep for switch to new superuser

add LockClock to the build + removed Trebuchet overlay