Move avalon and dropbox linux groups into the content::base manifest