Merge "[COMMON] Fix 'trap RETURN' and $BASHPID bashisms"