Merge "Add JUnit testing for PortSecurityHandler class."