Use new flavor names by default

Created by: berendt

JHFLAVOR=${JHFLAVOR:-SCS-1V-2-5}
FLAVOR=${FLAVOR:-SCS-1V-2-5}