Merge changes Ic7cd0c68,I580776cc into main

* changes:
  Move unrelated bash functions out of main
  Rename atest profilers explicitly