Fixed EE-6024/Github issue 4458. Endpoint addresses are converted to INetAddress objects before comparing them to see if they are the same server.
Refactored the file so the only diffs that show on GitHub are the relevant ones.
Re-edited the file so the only diffs that show on GitHub are the relevant ones.
#4465 don't show 'forcePush' if no bundle object
Merge pull request #4467 from dotCMS/issue-4465-pending-push-npe

#4465 don't show 'forcePush' if no bundle object
Merge pull request #4459 from lisandrozamora/master-2.5

Fix for issue #4458
#4468 default host fix
Merge pull request #4478 from dotCMS/issue-4468-more-default-hosts

#4468 default host fix
believe this fixes #4441, the logic was messed up before.  Needs testing
#4441 only one mention to each bundler
Merge pull request #4479 from dotCMS/issue-4441-osgi-folder-push-fail

Issue 4441 osgi folder push fail
Merge branch 'master-2.5' of https://github.com/dotCMS/dotCMS into master-2.5