Get the flyway bean from the context
Merge branch 'clustered_login_server', tag 'scotty_09012012' of github.com:cloudfoundry/uaa into clustered_login_server

Scotzilla filing
Merge remote-tracking branch 'origin/develop' into clustered_login_server