BISERVER-8427

Pull request including part of the BISERVER-8427 story. 
Updated settings xml due new Administrator role