Merge "Explicitly call restorecon_recursive on /metadata/apex"