Comment 9 for bug 1554714

Thanks, Mike. I have rebased the branch to master to resolve conflicts with the recently merged patron editor code. Pushed another fix to address the issue Mike raised. Plus one more fix to repair org unit dropdown widget.