Merge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev