- Fix issues in bashrc when sourced in a script (like the post-merge

git hook).
- Fix issue with failure to source bashrc in the post-merge git hook
(file not found issue).