[OS-BUILD PATCHv3 1/2] Fix warnings flagged by shellcheck tool.