Merge "Complain if update_current.py can't find pom2mk"