EC2 Admin api returns misformatted instance types

[Anthony Young]

Previously, instance type data was formatted like:

<?xml version="1.0"?>
<DescribeInstanceTypesResponse xmlns="http://ec2.amazonaws.com/doc/nova/">
  <requestId>MYBGBSHYSV8K-L97OVKO</requestId>
  <instanceTypeSet>
    <item>
      <memoryMb>4096</memoryMb>
      <vcpus>2</vcpus>
      <name>m1.medium</name>
      <diskGb>40</diskGb>
      <flavorId>3</flavorId>
    </item>
    ----- snip -----

In the most recent trunk it is formatted like so:

<?xml version="1.0"?>
<DescribeInstanceTypesResponse xmlns="http://ec2.amazonaws.com/doc/nova/">
  <requestId>Y9-P4PEW82WJY3NITSIH</requestId>
  <instanceTypeSet>
    <item>
      <m1.medium>
        <rxtxQuota>0</rxtxQuota>
        <localGb>40</localGb>
        <name>m1.medium</name>
        <deleted>false</deleted>
        <createdAt/>
        <updatedAt/>
        <memoryMb>4096</memoryMb>
        <vcpus>2</vcpus>
        <rxtxCap>0</rxtxCap>
        <flavorid>3</flavorid>
        <swap>0</swap>
        <deletedAt/>
        <id>1</id>
      </m1.medium>
      <m1.large>
      </m1.large>
      ----- snip -----

This causes formatting errors in the Openstack Dashboard.