CAS-1380: Fixed conflicts between spring and spring-security dependencies
Merge pull request #382 from Unicon/CAS-1380

CAS-1380: Fixed conflicts between spring and spring-security dependencies