Merge cloudfront index and index timestamp addons.