bug #4543 Changing column name can break saved "order by" clause

Signed-off-by: Marc Delisle <marc@infomarc.info>
resolve conflict

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>