Merge remote-tracking branch 'origin/zjw' into macan, fix it.
Delete files in original datacenter after data migration2.
Bug fix for getNextFID() and other file related enhancement.
Merge remote-tracking branch 'origin/macan' into zjw