Merged from trunk -r15272:15280

   Merged from trunk -r15272:15280

   | 15277   | Define userpriv_groups earlier in order to avoid an          |
   | zmedico | AttributeError from lazy import code. Thanks to antarus for  |
   |         | reporting.                                                   |

   | 15278   | Bug #277902 - When excluding config files, instead of using  |
   | zmedico | an empty file as a placeholder, use a file containing a      |
   |         | comment like this: # empty file because --include-config=n   |
   |         | when `quickpkg` was used                                     |

   | 15279   | Fix conditional logic for userpriv_groups intialization.     |
   | zmedico |                                                              |

   | 15280   | Fix code from r15278 for python3 unicode compatibility.      |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=15299