Merge "Add javadoc for (Persistable)Bundle.EMPTY" into sc-dev