Merge pull request #162 from apache/CONNECTORS-1754

Working on Connectors 1754