Pull additional 4.1 admin console fixes

Pull administration console additions for 4.1. 
Also fixes reappearance of System.out.println during merge