UHM-1158: Don't allow a provider to be scheduled for more than one block at the same time
Improved error message display so that once REST returns the right error message, this will display it properly
Merge remote-tracking branch 'origin/master'