Merge "Tweaked generated paths for ExternalStoreMwstore"