NOJIRA: Update X509's Ehcache dependency version to match parent.

Updated and fixed test failures as well.