MANATEE-188: Finish factoring out common code in manatee-adm