WP-4700 Build changes for testing.