Merge "Add salt-formula-manila packages to reclass"