(maint) Adding .ruby-version and .ruby-gemset to .gitignore for RVM users.
(maint) Fix acceptance test failure caused by backtrace preservation
change (GH-2293).
We should not be accessing the exception object from the else clause of
the begin/rescue/else.
Merge branch 'master' of https://github.com/puppetlabs/puppet