tweaks on build.sh
Merge pull request #1314 from clebertsuconic/2.2.eap5

fixes before rollout on 2.2.eap5
tweaks on build.sh