Trying once more to get 3.3.6 out the door

[Robert Goldman]

I have poked all the merge requests that were tagged for 3.3.6

If these are close to working, I will get them merged, otherwise I will 
drop them from the milestone, with an eye to getting 3.3.6 out soon.

If you get a chance to test your systems against the current version 
3.3.5.10 looking for any new problems, I would be very grateful. The 
regression tests can take us only so far.