sub db1015 into s6 during slave upgrades

Change-Id: If47ea4592645ce6468b52235c53b794671306618