Merge program_options revisions 79280 and 79283.

svn path=/branches/release/libs/program_options/; revision=79758
Merge: Really fixes #7049.

svn path=/branches/release/boost/program_options/; revision=82556