AUX_DIAG is used e.g. by Btrain. Another commit brings back availability
of diag command depending on AUX_DIAG in config file

This reverts commit df529bbb.