LPS-35647

LPS-35647 Replace Control Panel category Server with Apps, reorganizing portlets as necessary