Merge "sepolicy: update rules to support new config/data directory"