Pull 1.2.16 of configuration-overlay