Bring ngx_rtmp_hds_merge_app_conf inline with HLS and DASH
This also fixes a bug with newer versions of nginx and  blocks causing config file errors