Allow ENV HIVE_RELOAD_SCRIPTS to force reload of scripts.
Better concurrency control
Merge branch 'develop'