Merge pull request #342 from e-cuellar/5.1-LEGACY

Fix for BISERVER-10513
Fix for BISERVER-10515
Data Source Wizard - Fact table dropdown disappears