Merge "Remove preprov provider dependencies from CONF"