conflict resolved
Add LHCbVMDIRAC to the distribution
Merge pull request #1937 from atsareg/fix-v6r11

[v6r11] Minor fixes