FELIX-1591: fix last refactoring for cm being optional

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@825275 13f79535-47bb-0310-9956-ffa450edef68
1 file changed