re conf

Change-Id: Id3804640759bfb1360f564d94abde6975cfe90e2
deploy.sh

Change-Id: I8833a1559a2974e03e54517d6fd28acda24ef9c0