Merge branch '13996-new-api-config' refs #13996

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --cc doc/_config.yml
Simple merge

diff --cc services/api/app/models/container.rb
Simple merge

diff --cc services/api/test/unit/container_test.rb
Simple merge