#912 - Remove active id on login to prevent session timeout issue
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Merge branch 'BroadleafCommerce-3.1.x' into develop