CHANGE: Backport from Integration

in the getFileUserMetadata, also get the directory metadata.
Merge pull request #1460 from sposs/FCBackports

CHANGE: Backport from Integration