Backporting 3.1.x changes on PVManager, ChannelFinder and all the applications built on top.
g.b.channelfinder: fixed NPE in ChannelUtil
libs: updated the providers
o.c.p.libs.jersey: fix the library jars by including the correct versions
ChannelQuery, CFClientManager: refactored to gov.bnl.channelfinder.api, .
gov.bnl.channelfinder.api: adding extension point to configure default channelfinder client in CSS.
gov.bnl.channelfinder.api: fix: ChannelQuery may have executed a query more than once.
..channelfinder.api: check for serach string and throw more useful exception
..channelfinder.api: fixed version number
Merge
Merge
..channelfinder.api: fixed search, empty string used to clear search
..channelfinder.api: fixed search to handle the propname= condition, the faultly property/tag is also mentioned in the error message
gov.bnl.channelfinder.api: reviewed error messages
updating plug-ins names/descriptions/providers
..channelfinder.api: trustmanager return empty certificate list if no default matches.
This makes the api work on Java 7.
..channelfinder.api: updating to version 2.2.0

Change-Id: Iac416fb4f789573626095fddf53248c29e38e9d0
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>
Merge remote-tracking branch 'origin/logbook' into logbook
Merge branch '3.1.x'

Conflicts:
	.gitignore
	applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/DummyX509TrustManager.java
	applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Log.java
	applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Olog.java
	applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClient.java
	applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClientImpl.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/CFProperties.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/Channel.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelFinder.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelFinderClient.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelFinderClientComp.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelFinderClientImpl.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelFinderException.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelQuery.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelQueryListener.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ChannelUtil.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/ClientResponseParser.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/DummyX509TrustManager.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/MyX509TrustManager.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/Property.java
	applications/plugins/gov.bnl.channelfinder.api/src/gov/bnl/channelfinder/api/Tag.java
	applications/plugins/org.csstudio.channel.opiwidgets/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.channel.opiwidgets/plugin.xml
	applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/WaterfallModel.java
	applications/plugins/org.csstudio.channel.views/plugin.xml
	applications/plugins/org.csstudio.channel.widgets/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.channel.widgets/html/cf-changelog.html
	applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/Line2DPlotWidget.java
	applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyWidget.java
	applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/WaterfallConfigurationDialog.java
	applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/WaterfallConfigurationPanel.java
	applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/WaterfallWidget.java
	applications/plugins/org.csstudio.diag.pvmanager.probe/src/org/csstudio/diag/pvmanager/probe/PVManagerProbe.java
	applications/plugins/org.csstudio.logbook.olog/src/org/csstudio/logbook/olog/OlogLogbook.java
	applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/runmode/OPIRuntimeDelegate.java
	applications/plugins/org.csstudio.utility.olog.ui/html/olog-changelog.html
	applications/plugins/org.csstudio.utility.olog/src/org/csstudio/utility/olog/OlogClientFromPreferences.java
	applications/plugins/org.csstudio.utility.pvmanager.graphene/META-INF/MANIFEST.MF
	core/plugins/org.csstudio.ui.help/html/changelog/core.html
	core/plugins/org.csstudio.utility.pvmanager.extra/src/org/epics/pvmanager/extra/AdaptiveRange.java
	core/plugins/org.csstudio.utility.pvmanager.extra/src/org/epics/pvmanager/extra/DoubleArrayTimeCache.java
	core/plugins/org.csstudio.utility.pvmanager.extra/src/org/epics/pvmanager/extra/DoubleArrayTimeCacheFromVDoubleArray.java
	core/plugins/org.csstudio.utility.pvmanager.extra/src/org/epics/pvmanager/extra/DoubleArrayTimeCacheFromVDoubles.java
	core/plugins/org.csstudio.utility.pvmanager.extra/src/org/epics/pvmanager/extra/WaterfallPlot.java
	core/plugins/org.csstudio.utility.pvmanager.vtype/src/org/epics/pvmanager/vtype/ExpressionLanguage.java
	core/plugins/org.csstudio.utility.pvmanager/META-INF/MANIFEST.MF
	products/NSLS2/category.xml
	products/NSLS2/features/org.csstudio.nsls2.feature.core/feature.xml
	products/NSLS2/features/org.csstudio.nsls2.nslscore.feature/feature.xml
	products/NSLS2/features/org.csstudio.nsls2.product.feature/feature.xml
	products/NSLS2/plugins/org.csstudio.nsls2.product/ReleaseProcedure.txt
	products/NSLS2/plugins/org.csstudio.nsls2.product/css-nsls2.product
	products/NSLS2/plugins/org.csstudio.nsls2.startup.intro/html/changelog.html

Signed-off-by: Kunal Shroff <shroffk@bnl.gov>
fixing classpath of projects to use the default JREContainer

Change-Id: I07d887535c422baddaaab9934eacb7bd87c4ecd0
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>