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

Merge "Remove sshd reconfig from __lib/ironic__" 	 	279d2be
Merge "Devstack support for __Neutron VPNaaS__" 	1593db2
Merge "__Do not__ modify rsyslog files __if rsyslog is not used.__"