Merge "[COMMON] Fix trailing blanks in shell scripts"