Merge branch 'zombie-fix' into 20064
Issue #20064: Fixed Customer Ship To Bugs
Merge branch 'master' into 20064
Merge branch 'master_merge' into 20064
Issue #20064: Made SalesCustomer.shiptos be a CustomerShipto with permission to create
Merge pull request #874 from lynnaloo/20064

Issue #20064 - Fixed bugs in adding Shiptos to Customer and Selecting a Shipto in Quote/Sales Order
Fixed #21540

CharacteristicsWidget now supports setDisabled()
implemented test
Moved #21540 test code to crm/characteristics
Merge pull request #876 from tjwebb/INCDT-Bug-21540

Incident #21540:  Characteristics appear editable when they shouldn't be
add facility for using nginx as a proxy
fixed syntax
test tweaks
fix configure test
Merge pull request #878 from shackbarth/mocha5

get tests to pass
Merge pull request #877 from davecramer/master

add facility for using nginx as a proxy
Merge branch 'master' into 20311