Applied patch (FELIX-650) to properly return symbolic name when it has parameters; modified the patch slightly to deal with the case when the bundle has no symbolic name.