Merge pull request #412 from mmeisinger/fix1378_preload_m

OOIION-1378: OOI preload with full data product generation support /master
OOIION-1387 Change es to use vips plus update alpha and beta to use load test configuration
Merge pull request #414 from jamie-cyber1/ooi1372_rebase

OOIION-1387 Change es to use vips plus update alpha and beta to use load...
Merged in quashed postgres feature branch