SWITCHYARD-1500 update console to support new admin features
Merge remote-tracking branch 'upstream/master'