Fix floating device disablePortSecurity when the port is in PortSecurity with voip
Port-relase 3.6.1 version bump
Merge branch 'devel' into feature/pfarp_remote

Conflicts:
	NEWS