changed pending update test to get ip list before deletes
building server changes
Merge branch 'master' into mimic-test-fix
review and changed metadata to string, as nova does not allow int in value
Merge pull request #550 from rackerlabs/mimic-test-fix

Mimic test fix (ready for review)
added xml:id to the top-level <resources> tag so Diane Fleming can create a comprehensive Rackspace API reference
Merge pull request #561 from MariaAbrahms/rs_api_ref

added xml:id to the top-level <resources> tag so Diane Fleming can creat...
Merge branch 'master' into AS-34-delete-lbaas-test