Merge pull request #915 from e-cuellar/5.0

Fix for BISERVER-10240 Saving changes to a Report created from Save As, will push changes to original report
Fix for the spinners never closing after the second save.