reformat
FIX: lifetime was not pass to SE method on prestageFile calls
Merge pull request #1576 from graciani/fix_v6r7

Fix v6r7
v6r7p40
v6r8p25
Conflicts resolved after merging with rel-v6r7