Allow extra configs outside of puppet

Change-Id: Ie30cd5733e0da5a3d2034685eef5508a6cbb259c