#3346


Former-commit-id: 1a0b3c4a3ac197419933074a9bea34ff6e96ef45
fixed merge for #3386


Former-commit-id: 90fe05ac669f26068c647cf3c03c7a4db76be445
#3410


Former-commit-id: b2811b59973fcae6588e30cc8660d570ead619f6
#3387


Former-commit-id: 89e3e5b8fdc5f20104cef56b11c14c44c96e8407
fixes #3425


Former-commit-id: 2fa1642c4f560dd899f9a9c0e26d0484c222d172
makes ratingthread not update every piece of content  #3430


Former-commit-id: 884b91b8e1546c0c823ef479cc0a9b239847efde
gave a defualt to config var  #3430


Former-commit-id: 4509236579c391dc46fd3d895f56178775de486d
handle locked content  #3430


Former-commit-id: 6e35d4c6dc1c07f75f2123639b0c5c15b55a5c2f
fixes #3411


Former-commit-id: ad8fa9079d599dc74d9b1a29791ce658b09c0c4f
Merge pull request #3427 from dotCMS/issue-3425-npe-on-publish-history

fixes #3425

Former-commit-id: 8b63a13b06172eed60da2d1c83553cb9a102ecdb
fixes #3425


Former-commit-id: 7f69a67b3758d1e6281a7fc20aa3346b9e4b21bf
Merge branch 'master-2.5' of github.com:dotCMS/dotCMS into master-2.5


Former-commit-id: d91952b869356e6e781e01b5746ea63174a70904
fixes #3423


Former-commit-id: 24e1c22ca8125b02c150de1b3bbb7ad3c71d9b5a
Merge pull request #3433 from dotCMS/issue-3430-updateRatingThread-sucks

makes ratingthread not update every piece of content  #3430

Former-commit-id: 43d7acfc34902d3349378cec86efd5c9424bb409
#3345


Former-commit-id: 3d41d05dfd3759d97688376522308c5ffd26572a
#3345


Former-commit-id: 762d1bf9ea67fde34848969c4b3733a581c48fcf
#3345


Former-commit-id: dd7278ccd91f292b3d168e9a9088e129dea0add3
#3345


Former-commit-id: 8dca0d96b6565ee6146afbfcfd28cef4ec31d68c
#3345


Former-commit-id: 7924a2e8deb2d2b03553d021d823128963c752bd
#3345


Former-commit-id: 96fdd30c42384497a0f7b99a2b7981f2bcb01cc8