TEIID-2970 moving the addition of services prior to listener start
TEIID-2971
TEIID-2930 adding back with hold
TEIID-2964 allowing naming convention to override version
Merge pull request #242 from vhalbert/8.7.x

Updating pom to use CR8 bom, update cli scripts for productization
TEIID-2915: Adding kerberoes token delegation to REST web services
Merge pull request #243 from rareddy/TEIID-2915

Teiid 2915
TEIID-2959: Reverting SF matedata proeprties to original names
Merge pull request #247 from rareddy/TEIID-2959

TEIID-2959: Reverting SF matedata proeprties to original names
TEIID-2975 narrow fix for repairing namespaces
TEIID-2977 fix for function json results
TEIID-2968 turning off debug
TEIID-2979 adding back the google translator
Conflicts:

	test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
TEIID-2983, TEIID-2984: Fixing the error with COUNT(columnName) by rewriting the query
Merge pull request #248 from rareddy/TEIID-2983

Teiid 2983
adding a dependency needed to run non-container integration tests
TEIID-2986 fixing issues with embedded
Conflicts:

	connectors/connector-ws/kits/jboss-as7-dist.xml
Fixed following
TEIID-2983: disallowed multiple count aggregates in single select statement by throwing an exception
TEIID-2990: If no columns are projected the query will end up in exception; also if literal is being selected then added support for  from MongoDb 2.6
TEIID-2988: Added third paramters to  function to indicate the length of the string if only two parameters are supplied substring function
TEIID-2987: correctly projected when functions, aggregatefunctions are used in criteria of the sql statement, previously only column refereces were being projected
Merge pull request #250 from rareddy/TEIID-2987

Teiid 2987
TEIID-2985 allowing the script reader to ignore extra statement
delimiters