BUGFIX: speed up File Metadata searches and fix problem with locks
FIX: I line was missing
Merge pull request #1999 from graciani/bugfix_v6r10

[v6r10] BUGFIX: speed up File Metadata searches and fix problem with locks
v6r10p25 notes
v6r11p5 notes
Conflicts resolved with rel-v6r10