Merge remote-tracking branch 'origin/develop' into cleanup/candide-scripts-container

# Conflicts:
#	.felt/shapepipe/cleanup-rhostats-jobscripts/cleanup-rhostats-jobscripts.md

Author: cailmdaley