JDK7 - new diamon operator syntax

Handles https://github.com/Jasig/cas/issues/815