Removing '<<<<<<< HEAD' left over from a merge conflict

See 87718db7fb00
Be more specific that the CLI plugin JAR is also needed.
repository migration tools
Includes @Demobox feedbacks
Fix typo in MySQL category name
Add MSSQLStoredProcedures type to support MS SQL Server
Merge pull request #52 from CharlesBlonde/stored-procedures-mssql

MS SQL server support for Stored procedures plugin
Create print_task_step_logs.py
Delete print_task_step_logs.py
initial commit of the iseries plugin.
Merge pull request #51 from bmoussaud/repository-migration

repository migration tools
Releasing rpm-plugin-3.9.4-1.
Next development version rpm-plugin-3.9.4-2-SNAPSHOT.
Added BYOC plugin.
Small improvements
Release BYOC plugin 3.9.4
Development version BYOC plugin 3.9.4-1-SNAPSHOT
Merge pull request #54 from bmoussaud/iseries

initial commit of the iseries plugin.
Adding READMEs for the SSIS and SSRS plugins

Submitted by @cvandenthillart
Puppet Module Deployit 3.9 Native CLI