SWF-1569

Improvement for spring.js https://jira.springsource.org/browse/SWF-1569