Update enable_birthdate with ac-staging

Syncs some fixes so this branch works with vagrant up.