Merge "Only modify folders created by devstack"