Fix BaseException.message DeprecationWarning

https://review.openstack.org/#/c/32154/ introduces a deprecated
TypeError.message reference, which won't work in python3 and
causes a DeprecationWarning to be output on >= python 2.6

Change-Id: Ibd11d4ad6b82e96ede8f38fe76112bd71e98c5c9
Give alarm a physical_resource_name which need no id.

This restores previous behaviour, including workarounds for
circular dependencies.

Fixes bug: #1192814

Change-Id: I33e8e4d7806fb397553944dbd6ebb85b575b9cb5
Merge "Fix BaseException.message DeprecationWarning"
Merge "Give alarm a physical_resource_name which need no id."