merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism#54

nimbosa wants to merge 10 commits into

openstack:stable/icehouseopenstack/devstack:stable/icehousefrom

nimbosa:masternimbosa/devstack-icehouse:masterCopy head branch name to clipboard