Rebase the master and merge changes of PR 125
Rebase the master and merge changes of PR 121
Rebase the master and merge changes of PR 121
Rebase the master and merge changes of PR 121
Rebase the master and merge changes of PR 121
Rebase the master and merge changes of PR 125
Rebase the master and merge changes of PR 121
Reformat the class ClusterMonitorFactory
Reformat the class MessageFilter
Removing merge conflicts
Merge branch 'masterreviewfix2' of https://github.com/gayangunarathne/stratos