Merge "[COMMON] Fix a few bashisms"