Fix support status for OS::Heat::SoftwareComponent

Since SoftwareComponent is derived from SoftwareConfig, the support
status 2014.1 inherited from SoftwareConfig was incorrectly shown for
the SoftwareComponent resource.
This patch fixes the problem by correctly setting support_status in
the SoftwareComponent resource.

Change-Id: I973755f11e21ccb4f8bbc532da4de964e07c65f1
Don't shadow local variables "resource"

We could rename the local variables, but it's just as easy to not
use the resource module. Since the functions are not used, remove them.

Change-Id: I356fbe0042f24aba78fba5deebe7fa645a035d96
Merge "Don't shadow local variables "resource""
Merge "Fix support status for OS::Heat::SoftwareComponent"