Squashed commit of the following:

commit 3c9579a5b38f3495917e68d6777563fbef178eb3
Author: Filip Hanik <fhanik@gopivotal.com>
Date:   Mon Jan 20 17:26:32 2014 -0700

    Running into
    http://forum.spring.io/forum/spring-projects/security/114612-multiple-authentication-managers-defined-but-only-the-last-one-is-applied
    https://jira.springsource.org/browse/SEC-1937

    putting ID for one authentication-manager and alias for the other, makes ldap and saml login both work

commit 924721a1f7b4a9194e14438f1086c2626c7787da
Author: Filip Hanik <fhanik@gopivotal.com>
Date:   Mon Jan 20 16:12:31 2014 -0700

    break out SAML related beans into it's own profile, so that it's presence can be controlled through manifest options