Upgrade some policy repos to 18.04