o.c.alarm.service changed name rule for beacon records
o.c.p.libs.epics added link to sources for caj
Merge remote-tracking branch 'origin/rel15x' into rel15x

Conflicts:
	applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/internal/AlarmMessageDAL2Impl.java
	core/plugins/org.csstudio.platform.libs.epics/.classpath
Merge remote-tracking branch 'origin/rel15x' into rel15x

Conflicts:
	applications/plugins/org.csstudio.archive.reader/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.config.ioconfig.model/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.config.ioconfig.view/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.domain.desy.epics/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.domain.desy.ui/META-INF/MANIFEST.MF
	products/DESY/features/org.csstudio.desy.desytools.feature/feature.xml
	products/DESY/features/org.csstudio.desy.library.feature/feature.xml
	products/DESY/features/org.csstudio.desy.platform.base.feature/feature.xml
	products/DESY/plugins/org.csstudio.alarm.dal2jms/META-INF/MANIFEST.MF
	products/DESY/plugins/org.csstudio.desy.product/META-INF/MANIFEST.MF
	products/DESY/plugins/org.csstudio.desy.product/css.product