TDI-30448:SQL Builder: All new queries is autosaved as the last stored
query instead of new one after user open and save two queries.
Merge branch 'maintenance/5.6'