Merge pull request #186 from e-cuellar/master

Fix for BISERVER-8704 Unable to edit an Analysis data source.
Improved editing response time.