Fabricthree 709

Merging branch FABRICTHREE-709 (for issue FABRIC-18 in new Jira. The EhCache extension.) to branch 2.0.2.