Merge changes to HttpdConfigParser