Merge branch 'improvement/JAL-3474_lots_of_.cvsignore_files' into develop