fix for OPENAM-2257. Change discussed with Allan F. and Peter M. Trailing root directory removed from file list.
Fix for AME-202 - review: CR-802