Merge branch 'master' of https://code.ornl.gov/olcf/ContainerBuilder