There are a number of samples which are not marked either as contributions or webapps: maven-osgi-junit, distributed-osgi, implementation-composite folder. Should these samples have "-contribution" appended at the end? would that make the names unnecessarily long?
The OSGi ones are a bit tricky as they don't really match the new samples structure, maybe there should be a separate folder for OSGi in samples.
