This change ensures, that custom environments (which are not included in capabilities-map.yaml) are applied at the end of list of sorted environments rather than just skipped Closes-Bug: #1806406 Change-Id: Ia682284eff26883434fc516aefa8591599ec4394