Match NAS and Heritrix version statements used in WARC metadata and data files

In the 6.0 pre-release, there are some inconsistencies in NAS and Heritrix version statements used in WARC metadata and data files:

For metadata files:
in the warcinfo record, we have:
software: NetarchiveSuite/Version: 5.7-IIPCH3-SNAPSHOT (https://github.com/netarchivesuite/netarchivesuite/commit/3ed813811e34e2d2d86d7dfede9d9ea5a318328f)/https://sbforge.org/display/NAS

in resources records, we have:
WARC-Target-URI: metadata://netarchivesuite.bnf.fr/crawl/setup/crawler-beans.cxml?heritrixVersion=3.3.0-BDB-5.0.x-NAS-5.6&harvestid=9&jobid=98

For data files:
in warcinfo, we have:
software: Heritrix/3.4.0-IIPC-NAS-SNAPSHOT-2019-11-20T10:01:48Z http://crawler.archive.org
#added by NetarchiveSuite Version: 5.7-IIPCH3-SNAPSHOT (https://github.com/netarchivesuite/netarchivesuite/commit/3ed813811e34e2d2d86d7dfede9d9ea5a318328f)

Today, in 5.6, we have
For metadata files:
in the warcinfo record, we have:
software: NetarchiveSuite/Version: 5.6 (https://github.com/netarchivesuite/netarchivesuite/commit/7b15d7abf1ed8a11f000177058f3acbea23ab29f)/https://sbforge.org/display/NAS

in resources records, we have:
WARC-Target-URI: metadata://netarchivesuite.bnf.fr/crawl/setup/crawler-beans.cxml?heritrixVersion=3.3.0-BDB-5.0.x-NAS-5.6&harvestid=55&jobid=33118

For data files:
in warcinfo, we have:
software: Heritrix/3.3.0-BDB-5.0.x-NAS-5.6 http://crawler.archive.org
#added by NetarchiveSuite Version: 5.6 (https://github.com/netarchivesuite/netarchivesuite/commit/7b15d7abf1ed8a11f000177058f3acbea23ab29f)

Proposal :

For metadata files:
in the warcinfo record, we have:
software: NetarchiveSuite/Version: 6.0 (https://github.com/netarchivesuite/netarchivesuite/commit/3ed813811e34e2d2d86d7dfede9d9ea5a318328f)/https://sbforge.org/display/NAS

in resources records, we have:
WARC-Target-URI: metadata://netarchivesuite.bnf.fr/crawl/setup/crawler-beans.cxml?heritrixVersion=3.4.0-2020XXXX-NAS-6.0&harvestid=9&jobid=98

For data files:
in warcinfo, we have:
software: Heritrix/3.4.0-2020XXXX-NAS-6.0 http://crawler.archive.org
#added by NetarchiveSuite Version: 6.0(https://github.com/netarchivesuite/netarchivesuite/commit/3ed813811e34e2d2d86d7dfede9d9ea5a318328f)