Merge "Tag api gateway docker with stage and timestamp"