Changes Neutron Security Group Ports to Integers

Previously, neutron security group tcp/udp port numbers were
defined as strings.  This was not an issue when testing with trunk
but is an issue when testing with 2014.1.b2.

2014.1.b2 expects the parameters to be defined as integers not
strings.  When the tcp/udp ports are defined as integers, the
security group rules work with trunk as well as 2014.1.b2.

Change-Id: If7e5af163993b4cad3f31583ea73e9e856ab0ccb
Fixes Neutron Security Rules for Mcollective Communication

Previously, neutron security rules were incorrectly specified
to allow ActiveMQ TCP ports.  This was not previously observed
since a single OpenStack Compute Host was used to run Broker and
Node instances. Additionally, duplicate entries for ActiveMQ
TCP port 8161 were specified.  This patch removes the duplicate
entries and changes the TCP port number from ActiveMQ to
Mcollective (61613).

Change-Id: Ia35267a4485bba4aab36b9a629993ab94f42ad11
Merge "Changes Neutron Security Group Ports to Integers"
Merge "Fixes Neutron Security Rules for Mcollective Communication"