[PATCH 0/5] CMD_SAVEENV ifdef cleanup