Updates for versions.json
and related configuration
#3125
Merged
versions.json
and related configuration
#3125