Bug fixes (large and small) for new survey functionality
Merged changes from openpprn/opn/R2.0 branch into 1-0-stable