diff --git a/.gitignore b/.gitignore
index e5dd827b4505..fe3a6eaabdf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,8 +70,6 @@ package-lock.json
rel-eng/custom/__pycache__
# Intellij IDEA
-.idea/
-*.iml
java/out
out/
java/buildconf/checkstyle.cache.src
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100755
index 000000000000..13566b81b018
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100755
index 000000000000..5bac2c5c0458
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,15 @@
+
+
+
+ 10.19.0
+ JavaOnly
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100755
index 000000000000..b589d56e9f28
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100755
index 000000000000..03d9549ea8e4
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
new file mode 100644
index 000000000000..abc4237d367d
--- /dev/null
+++ b/.idea/libraries/lib.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100755
index 000000000000..00a92148954c
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100755
index 000000000000..adfa2765eeb6
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/spacewalk.iml b/.idea/spacewalk.iml
new file mode 100755
index 000000000000..e151878c76a3
--- /dev/null
+++ b/.idea/spacewalk.iml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100755
index 000000000000..35eb1ddfbbc0
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/branding/.idea/checkstyle-idea.xml b/branding/.idea/checkstyle-idea.xml
new file mode 100755
index 000000000000..5bac2c5c0458
--- /dev/null
+++ b/branding/.idea/checkstyle-idea.xml
@@ -0,0 +1,15 @@
+
+
+
+ 10.19.0
+ JavaOnly
+
+
+
+
+ (bundled)
+ (bundled)
+
+
+
+
\ No newline at end of file
diff --git a/branding/.idea/misc.xml b/branding/.idea/misc.xml
new file mode 100755
index 000000000000..07115cdf15dd
--- /dev/null
+++ b/branding/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/branding/.idea/modules.xml b/branding/.idea/modules.xml
new file mode 100755
index 000000000000..ad9917d4f813
--- /dev/null
+++ b/branding/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/branding/.idea/vcs.xml b/branding/.idea/vcs.xml
new file mode 100755
index 000000000000..6c0b8635858d
--- /dev/null
+++ b/branding/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/branding/branding.iml b/branding/branding.iml
new file mode 100755
index 000000000000..45f9c029839a
--- /dev/null
+++ b/branding/branding.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/code/.idea/.gitignore b/java/code/.idea/.gitignore
new file mode 100755
index 000000000000..26d33521af10
--- /dev/null
+++ b/java/code/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/java/code/.idea/checkstyle-idea.xml b/java/code/.idea/checkstyle-idea.xml
new file mode 100755
index 000000000000..5bac2c5c0458
--- /dev/null
+++ b/java/code/.idea/checkstyle-idea.xml
@@ -0,0 +1,15 @@
+
+
+
+ 10.19.0
+ JavaOnly
+
+
+
+
+ (bundled)
+ (bundled)
+
+
+
+
\ No newline at end of file
diff --git a/java/code/.idea/misc.xml b/java/code/.idea/misc.xml
new file mode 100755
index 000000000000..0b7cd82304fe
--- /dev/null
+++ b/java/code/.idea/misc.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/code/.idea/modules.xml b/java/code/.idea/modules.xml
new file mode 100755
index 000000000000..cb5ec82c1f20
--- /dev/null
+++ b/java/code/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/code/.idea/vcs.xml b/java/code/.idea/vcs.xml
new file mode 100755
index 000000000000..b2bdec2d71b6
--- /dev/null
+++ b/java/code/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file