Merge "Revert "Split property and file contexts modules""