master
Merge 3003 changes forward to the master branch (#59879)
review from @dwoz : rename to localfs_key
Merge branch '3006.x' into 3007.x (cycle 2)
Restore reclass ext_pillar adapter module
Restore pillarstack ext_pillar module