INTEXT-115 Update to SI 4.0, SF 4.0

JIRA: http://jira.spring.io/browse/INTEXT-115