Merge "Allow for Reconnect from Connection Manager" into nyc-mr1-dev