diff --git a/heat/locale/de/LC_MESSAGES/heat-log-error.po b/heat/locale/de/LC_MESSAGES/heat-log-error.po
index a1649e900..c7314e92f 100644
--- a/heat/locale/de/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/de/LC_MESSAGES/heat-log-error.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: 2014-12-17 02:38+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/heat/language/"
@@ -170,13 +170,13 @@ msgstr "Datenbankfehler %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "Signal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:260
-#, python-format
-msgid "Unable to retrieve stack %s for periodic task"
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
+#: heat/engine/service_stack_watch.py:69
+#, python-format
+msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
 #: heat/engine/stack.py:728
@@ -205,7 +205,7 @@ msgid ""
 "conf."
 msgstr ""
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr "Port nicht angegeben."
 
diff --git a/heat/locale/es/LC_MESSAGES/heat-log-error.po b/heat/locale/es/LC_MESSAGES/heat-log-error.po
index 5075d7b4e..a1362f185 100644
--- a/heat/locale/es/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/es/LC_MESSAGES/heat-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: 2014-12-17 02:38+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/heat/language/"
@@ -173,15 +173,15 @@ msgstr "Error de base de datos %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "señal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:260
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
+msgstr ""
+
+#: heat/engine/service_stack_watch.py:69
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "No ha sido posible obtener la pila %s para tareas periódicas"
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
-msgstr ""
-
 #: heat/engine/stack.py:728
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -208,7 +208,7 @@ msgid ""
 "conf."
 msgstr ""
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr ""
 
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-error.po b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
index 9bf03a8d2..ffba43d85 100644
--- a/heat/locale/fr/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: 2014-12-17 02:38+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/heat/language/"
@@ -175,15 +175,15 @@ msgstr "Erreur base de donné %s"
 msgid "signal %(name)s : %(msg)s"
 msgstr "signal %(name)s : %(msg)s"
 
-#: heat/engine/service.py:260
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
+msgstr ""
+
+#: heat/engine/service_stack_watch.py:69
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "Impossible de récupérer la stack %s pour la tache périodique"
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
-msgstr ""
-
 #: heat/engine/stack.py:728
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -210,7 +210,7 @@ msgid ""
 "conf."
 msgstr ""
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr "Port non spécifié"
 
diff --git a/heat/locale/heat-log-error.pot b/heat/locale/heat-log-error.pot
index 920e88689..cd4775a3a 100644
--- a/heat/locale/heat-log-error.pot
+++ b/heat/locale/heat-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev640\n"
+"Project-Id-Version: heat 2015.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -166,13 +166,13 @@ msgstr ""
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:260
-#, python-format
-msgid "Unable to retrieve stack %s for periodic task"
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
+#: heat/engine/service_stack_watch.py:69
+#, python-format
+msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
 #: heat/engine/stack.py:728
@@ -201,7 +201,7 @@ msgid ""
 "nova.conf."
 msgstr ""
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr ""
 
diff --git a/heat/locale/heat-log-warning.pot b/heat/locale/heat-log-warning.pot
index e56e4cfaa..e2fa81808 100644
--- a/heat/locale/heat-log-warning.pot
+++ b/heat/locale/heat-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev522.g8c1da0b\n"
+"Project-Id-Version: heat 2015.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-08 06:00+0000\n"
+"POT-Creation-Date: 2014-12-21 06:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,47 +33,47 @@ msgid ""
 "falling back to using default"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:313
+#: heat/common/heat_keystoneclient.py:319
 #, python-format
 msgid "Truncating the username %s to the last 64 characters."
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:424
+#: heat/common/heat_keystoneclient.py:430
 msgid ""
 "Falling back to legacy non-domain user create, configure domain in "
 "heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:477
+#: heat/common/heat_keystoneclient.py:483
 msgid ""
 "Falling back to legacy non-domain user delete, configure domain in "
 "heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:498
-#: heat/common/heat_keystoneclient.py:515
+#: heat/common/heat_keystoneclient.py:504
+#: heat/common/heat_keystoneclient.py:521
 msgid "Falling back to legacy non-domain project, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:527
+#: heat/common/heat_keystoneclient.py:533
 #, python-format
 msgid "Unable to get details for project %s, not deleting"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:532
+#: heat/common/heat_keystoneclient.py:538
 msgid "Not deleting non heat-domain project"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:606
-#: heat/common/heat_keystoneclient.py:623
+#: heat/common/heat_keystoneclient.py:612
+#: heat/common/heat_keystoneclient.py:629
 msgid "Falling back to legacy non-domain keypair, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:642
+#: heat/common/heat_keystoneclient.py:648
 msgid "Falling back to legacy non-domain disable, configure domain in heat.conf"
 msgstr ""
 
-#: heat/common/heat_keystoneclient.py:652
+#: heat/common/heat_keystoneclient.py:658
 msgid "Falling back to legacy non-domain enable, configure domain in heat.conf"
 msgstr ""
 
@@ -94,51 +94,51 @@ msgstr ""
 msgid "Unable to serialize exception response"
 msgstr ""
 
-#: heat/engine/environment.py:199 heat/engine/environment.py:205
+#: heat/engine/environment.py:202 heat/engine/environment.py:208
 #, python-format
 msgid "Removing %(item)s from %(path)s"
 msgstr ""
 
-#: heat/engine/environment.py:218
+#: heat/engine/environment.py:221
 #, python-format
 msgid "Changing %(path)s from %(was)s to %(now)s"
 msgstr ""
 
-#: heat/engine/resource.py:910
+#: heat/engine/resource.py:913
 #, python-format
 msgid "db error %s"
 msgstr ""
 
-#: heat/engine/resource.py:1096
+#: heat/engine/resource.py:1099
 #, python-format
 msgid "Resource %s does not implement metadata update"
 msgstr ""
 
-#: heat/engine/service.py:275
-#, python-format
-msgid "periodic_task db error watch rule removed? %(ex)s"
-msgstr ""
-
-#: heat/engine/service.py:1101
+#: heat/engine/service.py:1028
 #, python-format
 msgid "Access denied to resource %s"
 msgstr ""
 
-#: heat/engine/service.py:1358
+#: heat/engine/service.py:1285
 #, python-format
 msgid "show_watch (all) db error %s"
 msgstr ""
 
-#: heat/engine/service.py:1387
+#: heat/engine/service.py:1314
 #, python-format
 msgid "show_metric (all) db error %s"
 msgstr ""
 
+#: heat/engine/service_stack_watch.py:84
+#, python-format
+msgid "periodic_task db error watch rule removed? %(ex)s"
+msgstr ""
+
 #: heat/engine/signal_responder.py:68
 msgid "Cannot generate signed url, no stored access/secret key"
 msgstr ""
 
-#: heat/engine/stack.py:239
+#: heat/engine/stack.py:241
 msgid "Unable to set parameters StackId identifier"
 msgstr ""
 
@@ -147,7 +147,7 @@ msgstr ""
 msgid "Lock was already released on stack %s!"
 msgstr ""
 
-#: heat/engine/stack_resource.py:115
+#: heat/engine/stack_resource.py:133
 #, python-format
 msgid "Preview of '%s' not yet implemented"
 msgstr ""
@@ -190,12 +190,12 @@ msgid ""
 "server.get(): %(exception)s"
 msgstr ""
 
-#: heat/engine/clients/os/nova.py:407 heat/engine/resources/nova_utils.py:383
+#: heat/engine/clients/os/nova.py:409 heat/engine/resources/nova_utils.py:383
 #, python-format
 msgid "Instance (%(server)s) not found: %(ex)s"
 msgstr ""
 
-#: heat/engine/clients/os/nova.py:418
+#: heat/engine/clients/os/nova.py:420
 #, python-format
 msgid "Server (%(server)s) not found: %(ex)s"
 msgstr ""
@@ -204,19 +204,19 @@ msgstr ""
 msgid "Skipping association, resource not specified"
 msgstr ""
 
-#: heat/engine/resources/os_database.py:340
+#: heat/engine/resources/os_database.py:341
 #, python-format
 msgid ""
 "Stack %(name)s (%(id)s) received an OverLimit response during "
 "instance.get(): %(exception)s"
 msgstr ""
 
-#: heat/engine/resources/swift.py:175
+#: heat/engine/resources/swift.py:176
 #, python-format
 msgid "Head container failed: %s"
 msgstr ""
 
-#: heat/engine/resources/wait_condition.py:69
+#: heat/engine/resources/wait_condition.py:70
 #, python-format
 msgid "Overwriting Metadata item for id %s!"
 msgstr ""
@@ -236,32 +236,32 @@ msgstr ""
 msgid "pid %d not in child list"
 msgstr ""
 
-#: heat/tests/generic_resource.py:36
+#: heat/tests/generic_resource.py:37
 #, python-format
 msgid "Creating generic resource (Type \"%s\")"
 msgstr ""
 
-#: heat/tests/generic_resource.py:40
+#: heat/tests/generic_resource.py:41
 #, python-format
 msgid "Updating generic resource (Type \"%s\")"
 msgstr ""
 
-#: heat/tests/generic_resource.py:44
+#: heat/tests/generic_resource.py:45
 #, python-format
 msgid "Deleting generic resource (Type \"%s\")"
 msgstr ""
 
-#: heat/tests/generic_resource.py:51
+#: heat/tests/generic_resource.py:52
 #, python-format
 msgid "Suspending generic resource (Type \"%s\")"
 msgstr ""
 
-#: heat/tests/generic_resource.py:55
+#: heat/tests/generic_resource.py:56
 #, python-format
 msgid "Resuming generic resource (Type \"%s\")"
 msgstr ""
 
-#: heat/tests/generic_resource.py:144
+#: heat/tests/generic_resource.py:145
 #, python-format
 msgid "Signaled resource (Type \"%(type)s\") %(details)s"
 msgstr ""
diff --git a/heat/locale/heat.pot b/heat/locale/heat.pot
index 69f81a226..0acb358d1 100644
--- a/heat/locale/heat.pot
+++ b/heat/locale/heat.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: heat 2015.1.dev640\n"
+"Project-Id-Version: heat 2015.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -679,41 +679,46 @@ msgstr ""
 msgid "Cannot define the following properties at the same time: %(props)s."
 msgstr ""
 
-#: heat/common/exception.py:341
+#: heat/common/exception.py:331
+#, python-format
+msgid "At least one of the following properties must be specified: %(props)s"
+msgstr ""
+
+#: heat/common/exception.py:351
 msgid ""
 "Egress rules are only allowed when Neutron is used and the 'VpcId' "
 "property is set."
 msgstr ""
 
-#: heat/common/exception.py:353
+#: heat/common/exception.py:363
 msgid "Not found"
 msgstr ""
 
-#: heat/common/exception.py:359
+#: heat/common/exception.py:369
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: heat/common/exception.py:363
+#: heat/common/exception.py:373
 #, python-format
 msgid "Request limit exceeded: %(message)s"
 msgstr ""
 
-#: heat/common/exception.py:367
+#: heat/common/exception.py:377
 msgid "Maximum resources per stack exceeded."
 msgstr ""
 
-#: heat/common/exception.py:371
+#: heat/common/exception.py:381
 #, python-format
 msgid "Stack %(stack_name)s already has an action (%(action)s) in progress."
 msgstr ""
 
-#: heat/common/exception.py:376
+#: heat/common/exception.py:386
 #, python-format
 msgid "Failed to stop stack (%(stack_name)s) on other engine (%(engine_id)s)"
 msgstr ""
 
-#: heat/common/exception.py:381
+#: heat/common/exception.py:391
 #, python-format
 msgid ""
 "Failed to send message to stack (%(stack_name)s) on other engine "
@@ -1402,31 +1407,31 @@ msgstr ""
 msgid "%s Timed out"
 msgstr ""
 
-#: heat/engine/service.py:565
+#: heat/engine/service.py:484
 #, python-format
 msgid ""
 "You have reached the maximum stacks per tenant, %d. Please delete some "
 "stacks."
 msgstr ""
 
-#: heat/engine/service.py:720
+#: heat/engine/service.py:639
 msgid "Updating a stack when it is suspended"
 msgstr ""
 
-#: heat/engine/service.py:724
+#: heat/engine/service.py:643
 msgid "Updating a stack when it is deleting"
 msgstr ""
 
-#: heat/engine/service.py:774
+#: heat/engine/service.py:693
 #, python-format
 msgid "Cancelling update when stack is %s"
 msgstr ""
 
-#: heat/engine/service.py:813
+#: heat/engine/service.py:732
 msgid "No Template provided."
 msgstr ""
 
-#: heat/engine/service.py:1457
+#: heat/engine/service.py:1376
 msgid "server_id must be specified"
 msgstr ""
 
@@ -1929,11 +1934,7 @@ msgstr ""
 msgid "Must specify 'InstanceId' if you specify 'EIP'."
 msgstr ""
 
-#: heat/engine/resources/eip.py:242
-msgid "Must specify at least one of 'InstanceId' or 'NetworkInterfaceId'."
-msgstr ""
-
-#: heat/engine/resources/eip.py:331 heat/engine/resources/eip.py:354
+#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
 msgid "Failed to update, can not found port info."
 msgstr ""
 
@@ -4525,12 +4526,7 @@ msgstr ""
 msgid "segmentation_id cannot be specified except 0 for using flat"
 msgstr ""
 
-#: heat/engine/resources/neutron/neutron.py:62
-#, python-format
-msgid "Either %(prop_key)s or %(depr_prop_key)s should be specified."
-msgstr ""
-
-#: heat/engine/resources/neutron/neutron.py:118
+#: heat/engine/resources/neutron/neutron.py:115
 msgid "Resource is not built"
 msgstr ""
 
diff --git a/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po b/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
index b6e8eb300..3125d23f0 100644
--- a/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/ko_KR/LC_MESSAGES/heat-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: 2014-12-17 02:38+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/heat/"
@@ -171,15 +171,15 @@ msgstr "DB %s에 오류가 있습니다. "
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:260
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
+msgstr "네임 스페이스의 필터링 / 메트릭은 아직 지원하지 않습니다. "
+
+#: heat/engine/service_stack_watch.py:69
 #, python-format
 msgid "Unable to retrieve stack %s for periodic task"
 msgstr "주기적인 작업에 대한 스택 %s를 검색 할 수 없습니다"
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
-msgstr "네임 스페이스의 필터링 / 메트릭은 아직 지원하지 않습니다. "
-
 #: heat/engine/stack.py:728
 #, python-format
 msgid "Unexpected action %s passed to update!"
@@ -208,7 +208,7 @@ msgstr ""
 "기본 유동 IP pool을 구성하지 않습니다. nova.conf에서 "
 "'default_floating_pool'을 설정합니다."
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr "Port가 정의되지 않았습니다."
 
diff --git a/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po b/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
index 6511e52e5..3abbd4a9f 100644
--- a/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/pt_BR/LC_MESSAGES/heat-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Heat\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-18 06:04+0000\n"
+"POT-Creation-Date: 2014-12-21 06:02+0000\n"
 "PO-Revision-Date: 2014-12-17 02:38+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/heat/"
@@ -171,13 +171,13 @@ msgstr ""
 msgid "signal %(name)s : %(msg)s"
 msgstr ""
 
-#: heat/engine/service.py:260
-#, python-format
-msgid "Unable to retrieve stack %s for periodic task"
+#: heat/engine/service.py:1308
+msgid "Filtering by namespace/metric not yet supported"
 msgstr ""
 
-#: heat/engine/service.py:1389
-msgid "Filtering by namespace/metric not yet supported"
+#: heat/engine/service_stack_watch.py:69
+#, python-format
+msgid "Unable to retrieve stack %s for periodic task"
 msgstr ""
 
 #: heat/engine/stack.py:728
@@ -206,7 +206,7 @@ msgid ""
 "conf."
 msgstr ""
 
-#: heat/engine/resources/eip.py:330 heat/engine/resources/eip.py:353
+#: heat/engine/resources/eip.py:329 heat/engine/resources/eip.py:352
 msgid "Port not specified."
 msgstr ""