Fix upgrade code to not be triggered when it shouldnt, Add logging for time to process htable.batch,Fix compiler warnings