Merge "BUG-467: reconnect-strategy configuration moved into controller/commons/protoc...