Bug 1013292 - Tolerate OSE1.2 attributes

Also, prep for API 1.6 support by handling id/name changes on Domain
gracefully.

@jwforres review plz