The other changes correct problems with interaction between settings.py and settings_local.py.
They are in the same pull request because the last commit corrects a bug in the backwards compatible Django 1.4 changes. I don't see how to cherry pick that bugfix with the first set of changes without including the second set.
I don't really use or maintain Byteflow already, but this seems like no-brainer to me, absolutely safe to merge. I have one note though: use 'key' in dict instead of has_key to check if dictionary has the key, that's how Python does it right now.
Also, in one of comments you have a misprint: 'depricated'.