Merge proposals dependent on lp://staging/~freyes/openstack-charm-testing/fix-port_security2

1. fix-port_security2
2. Dependent merge proposals