Code cleanup for csvimport.php
Merge branch 'dstockto-csvimport_cleanup'