UCJEPS-444: Use existing template when creating new from existing.
UCJEPS-444: Use existing template when creating new from existing.
Merge branch 'ucb-deploy_3.3' into ucjeps_3.3