Merge "Removing deprecated live_folders creation support"