Address deprecation warnings#21

jblueh merged 2 commits intomastersu2code/Docker-Builds:masterfrom

address_deprecation_warningssu2code/Docker-Builds:address_deprecation_warningsCopy head branch name to clipboard