cherry pick php5 puppet manifest from develop