Revert "(maint) Remove acceptance test for puppet --parseonly deprecation"

This reverts commit ad762cbe176ad8a53e3f1578b0fd7818c48bd7e9.

This commit is being reverted because the underlying issue is caused by
a simply MRI block arity issue.  Josh has fixed this in master, so the
fix will be back-ported to stable for the Puppet 3.2 release.
Maint: Lambda arity must match number of arguments

Running `puppet apply --parseonly` fails on ruby 1.9, because the arity
of the option method was 0, yet was being invoked with an argument, the
manifest to parse. Under ruby 1.8, this mismatch was allowed, but not
1.9.

See acceptance/tests/ticket_6928_puppet_master_parse_fails.rb
(maint) `--parseonly` lambda arity must match number of arguments

Running `puppet apply --parseonly` and `puppet master --parseonly` fails on
ruby 1.9, because the arity of the option method was 0, yet was being invoked
with an argument, the manifest to parse. Under ruby 1.8, this mismatch was
allowed, but not 1.9.

This patch builds upon Josh's patch in e9c25f6, the previous patch only
addressed `puppet apply` while the acceptance test uses both `puppet apply` and
`puppet master`.  In order to address the test failure this patch adds the
block arguments for both apply and master.

See acceptance/tests/ticket_6928_puppet_master_parse_fails.rb
Merge branch 'fix_cli_arity' into stable

* fix_cli_arity:
  (maint) `--parseonly` lambda arity must match number of arguments
  Maint: Lambda arity must match number of arguments
  Revert "(maint) Remove acceptance test for puppet --parseonly deprecation"

closes #1632
Merge branch 'stable'

* stable:
  (maint) `--parseonly` lambda arity must match number of arguments
  Maint: Lambda arity must match number of arguments
  Revert "(maint) Remove acceptance test for puppet --parseonly deprecation"