changes for RA4
Merge branch 'SLC6-master' of https://github.com/HephySusySW/Workspace into SLC6-master