[BISERVER-10372] Fix non-sprint bug that reverses user and roles in metadata securty node when saving a new DSW SQL Query
Merge branch '5.1-LEGACY' into 5.1-LEGACY-FEATURE
Merge pull request #382 from tkafalas/5.1-LEGACY-FEATURE

5.1 legacy feature