Merge "Add property to force restorecon to run." into nyc-mr1-dev