[6.15.z] Docker repos now support on demand policy

[6.15.z] Docker repos now support on demand policy #9877