21.6: support for 7-digit DSIDs

Christian Gutschowrequested to merge
cgutscho/athena:seven_digit_support into 21.6

Gen_tf tweaks to support 7-digit DSIDs.

cc @ewelina

Edited by Christian Gutschow

Merge request reports