Generators: support both Sherpa 2.x and 3.x syntax

This change set is to sync Sherpa_i with 21.6 and support both the 2.x and 3.x release series.

cc @ewelina @fsiegert