Upgrade to ehcache 2.8.4
Set the version to 1.0.3
Set the version to 1.0.4-SNAPSHOT
Merge remote-tracking branch 'upstream/master'