Merge "Small clean ups for issues raised in reviews of fastdeploy"