Reworked plenary rewriting for cluster-related service chooser.
Reworked plenary rewriting for cluster-related service chooser.

stdweird/aquilon,guillaume-philippon/aquilon,quattor/aquilon,quattor/aquilon,guillaume-philippon/aquilon,quattor/aquilon,guillaume-philippon/aquilon,stdweird/aquilon,stdweird/aquilon