ENG-5163 genqa modifications to handle elastic configurations better