Rebase puppet-barbican to 92c6c2f to pull in current version
*** This bug has been marked as a duplicate of bug 1639520 ***