DO NOT MERGE - Use Spring security rather than Shiro.

We also have a migration env.