Merge "Change ENUMS used in config yangs for Strings"