Merge "Only full-data back up regular files + directories" into nyc-mr1-dev