Missing change from last commit

Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
Recording .gitmergeinfo Changes
Fixing build