DDF-160: Removed service factory option from metatype.

Also removed DDF references in metatype and javadoc.