Changes related to spring configuration, and Master account related
functionality.