[us-commits] [ehb54/us3lims_common] aaf54e: manaul merge newgridctl, newgridctl-js237 to master