Re-order the cases of base-files/* alphabetically. Also merge some cases in diag.sh Signed-off-by: Paul Wassi <p.wassi@gmx.at>