Merge "Use new aptly containers" into release/proposed/2019.2.0