Upgrade to Spring 4.1.0 and use Yaml support that migrated from Boot

Closes #813