fix clustering for non-scaled AS/EAP
Merge pull request #2411 from bdecoste/master

Merged by openshift-bot