LPS-37673 Fix compile
LPS-37571
LPS-37630 Use UserNotificationManagerUtil and minor markup fixes
LPS-37630 CSS fix
LPS-37733 Show which portlets are in the control panel
LPS-37733 Sort
LPS-37545 Apply
LPS-37718 Made tests compatible with the new way of dealing with nullable servlet names