merged upstream/master
build.gradle: updated to use seleniumVersion 2.43.1; added safari to
list of drivers.
GebConfig.groovy: added safari to list of drivers.
storedProcs.txt: added @ApplyBinaryLogSP(2) to the list of expected
stored procedures.
sql.txt: fixed the timestamp formats for two tests (SelectAll,
SysSelect).
New logos for studio
Merge pull request #1679 from VoltDB/new_logos

New logos for studio - r=jhugg
StudioWebDiag.groovy: updated to use the new UI (mock-up) - optionally,
only when USE_NEW_UI is true.
ENG-6897: expose flush on CSVTuple and Bulk iinterface.
ENG-6930: Fix a boolean polarity issue in the JDBC driver.
Merge pull request #1680 from VoltDB/johnc-geb-innovation-week

Johnc geb innovation week
elemsNewUI.txt: added missing file, which should have been checked into
branch johnc-geb-innovation-week (which was already merged to master).
Set Version 4.8
initial support for AdHoc upsert
Avoid compiling regex in the parameter converter.

Building a regex can be costly in the fast path. Build it once and reuse it.
Merge pull request #1682 from VoltDB/paramconvopt

Avoid compiling regex in the parameter converter.
ENG-6897: flush to drain for -p inserts.
remove redundant upsert plan node and executor and use the insert executor only; add more tests
refactor some stuffs
Merge pull request #1684 from VoltDB/ENG-6922-agg-plan

refactor some stuffs