Merge "Fix LeoUpdate script so that only one boot folder is present" into gingerbread