#3549 for master
fixes #3558
Merge pull request #3568 from dotCMS/issue-3558-push-delete-not-existing-folder-error

fixes #3558
#3567
Merge pull request #3570 from dotCMS/issue-3567-vertical-scroll-time-machine-settings-window

#3567
fixes #3564 error in console for past time machine snapshot
Merge pull request #3571 from dotCMS/issue-3564-error-in-console-for-past-time-machine-snapshot

fixes #3564 error in console for past time machine snapshot
#3493
fixes #3561
Merge pull request #3574 from dotCMS/issue-3493-avoid-adding-a-category-twice

#3493
Merge pull request #3576 from dotCMS/issue-3561-tag-manager-search-fails-on-tagnames-with-multiple-words

fixes #3561
Merge pull request #3553 from dotCMS/issue-3549-Windows-Enviroment-Showing-System-instead-of-Jar-name-for-Dynamic-Plugins

#3549 for master
merging #3479
Merge remote-tracking branch 'origin' into issue-3479-mod-date-for-cats-struts-fields-folders