Merge "Migrate maven to freestyle for integration"