Fixing STRATOS-802
Merge branch 'master' of https://github.com/apache/stratos into master-cluster-monitors