Merge "move cts-instant*.xml into new config location" into pi-dev
am: b168733b03

Change-Id: I46f8772776a1add89ba36fb15df3a26dfc3321e6