SQLCommand.java cleanup: whitespace, a few redundancies, a regexp bug
Make modifiying/adding unique indexes and narrowing cols work.
Patch a sqlcmd LoadProcedures regression, a few tweaks, some from r=chris
ENG-6855: Refactor convenient methods in Permission so that there is only one
path that handles permission hierarchy mapping.
ENG-6855: Add permission inference.

SQL includes SQLREAD, DEFAULTPROC
SQLREAD includes DEFAULTPROCREAD
DEFAULTPROC includes DEFAULTPROCREAD
ADMIN includes everything

Only check for the appropriate permission in the permission policies.
Merge branch 'master' into pmartel_sqlcmd_mostly_whitespace
Improve edge case CanonicalDDL test diagnostics
ENG-6858: Add default roles ADMINISTRATOR and USER.

The default roles cannot be disabled nor overriden by roles with the same name
in the DDL.
Merge pull request #1755 from VoltDB/ENG-6858

ENG-6858: Add default roles ADMINISTRATOR and USER.

r=akhanzode
ENG-6855: Fix broken tests.
Add export exception for column narrowing and fix tests.
Merge remote-tracking branch 'origin/master' into ENG-6071-emptytables2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Make SIZES comment well-formed HTML.
Merge pull request #1756 from VoltDB/ENG-7126-broken-size-worksheet

Make SIZES comment well-formed HTML.
fix sqlcmd regression in selector param trimming
Reworked timeout detection in TestCanonicalDDLThroughSQLcmd
Fix assert() vs fail() bug and patch up test.
Merge remote-tracking branch 'origin/master' into ENG-6071-emptytables2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ENG-7068 database fails if security is enabled with no users
Merge pull request #1753 from VoltDB/ENG-6855

ENG-6855: Add permission inference

r=akhanzode