Merge branches/temp-admin@3208 onto trunk@3208.
Merge admin framework from config-prototype-branch onto trunk.