SP-570 Baskport of edit data source wizard - added license headers and

code fixes from 5.1