msftidy no warnings
Merge branch 'module-simatic-wincc-harvester' of https://github.com/nxnrt/metasploit-framework into module-simatic-wincc-harvester

Conflicts:
	modules/auxiliary/admin/scada/simatic_wincc_harvester.rb