obj_make_compatible is wrong

[Matt Riedemann]

Commit 7cdfdccf1bb936d559bd3e247094a817bb3c03f4 attempted to make the obj_make_compatible calls consistent, but it actually changed them the wrong way.

Change https://review.openstack.org/#/c/121663/ addresses the bug but is sitting on top of a change that might be too risky at this point for juno-rc1, so this should be a separate fix.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/124082

[OpenStack Infra (hudson-openstack)]

Change abandoned by boden (<email address hidden>) on branch: master
Review: https://review.openstack.org/124082
Reason: abandon in light of: https://review.openstack.org/#/c/121663/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/121663
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=279b6e98bc72c906ac2c3f8665a1acdc99b30833
Submitter: Jenkins
Branch: master

commit 279b6e98bc72c906ac2c3f8665a1acdc99b30833
Author: Vishvananda Ishaya <email address hidden>
Date: Sat Sep 13 11:56:57 2014 -0700

    Undo changes to obj_make_compatible

    Commit 7cdfdccf1bb936d559bd3e247094a817bb3c03f4 attempted to make
    the obj_make_compatible calls consistent, but it actually changed
    them the wrong way. This fixes them to unwrap nova_object.data
    and updates the test that was testing the reverse.

    Change-Id: I1a5db4e9817390ba3c2423d33387f780c890de64
    Closes-Bug: #1373535