added global parameter --inactive-time-stamps
filenametimestamps: added parameter --ignore-non-existing-items and --filelist
fixed minor merge conflict