Merge "Bug:129 Connection Manager Dashlet"