bb-config.php local fixes
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x
Die after redirecting to password reset page

This ensures that the template will load
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x