Merge pull request #336 from e-cuellar/5.0

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