Add fmd_tmp_location to jobmetadata resource. CAF-231
Rename to filemetadata and move SQL query in the right place. CAF-233
fix conficts
Merge pull request #3998 from spigad/master

 merge mmascher-master