Merge "Added UT and refactored code 1) Added UT for SecurityServicesImpl and Security...