Merge "Fix nginx configuration for  Flower"