Fixed recursive traversal of bashrc.d subfolders
Merge branch 'common' into t400