Add columns_to_join to instance_update_and_get_original

Add a parameter to instance_update_and_get_original() to specify the
expecected columns to be returned.

Change-Id: Ib324fdf02f3d462970cdf7c7065ddc3d87f72fba
Signed-off-by: Yongli He
Merge "Add columns_to_join to instance_update_and_get_original"