Deprecate old types (these have actually been deprecated a long time ago, but never have been marked as such)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1648503 13f79535-47bb-0310-9956-ffa450edef68