Merge "Support cloud-specific suffixes to server status."

diff --cc heat/tests/test_instance.py
index 937e534a7f671528c552fe57ece10837a404b385,17346cbab3cb403b66673fe31507f69cd97af2af..457ef8502c6e028bdcd43da2c7aeabcd2f50f534
--- 1/heat/tests/test_instance.py
--- 2/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@@ -286,8 -285,11 +286,11 @@@ class instancesTest(HeatTestCase)
          self.m.ReplayAll()
  
          scheduler.TaskRunner(instance.create)()
 -        self.assertEqual(instance.state, instance.CREATE_COMPLETE)
 +        self.assertEqual(instance.state, (instance.CREATE, instance.COMPLETE))
  
+     def test_instance_status_build_spawning(self):
+         self._test_instance_status_not_build_active('BUILD(SPAWNING)')
+ 
      def test_instance_status_hard_reboot(self):
          self._test_instance_status_not_build_active('HARD_REBOOT')