diff --git a/.idea/dictionaries/kirillk.xml b/.idea/dictionaries/kirillk.xml
new file mode 100644
index 000000000000..72509ca8b8f7
--- /dev/null
+++ b/.idea/dictionaries/kirillk.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="kirillk" />
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 46a1e1effbc3..555c24e353a0 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -239,7 +239,7 @@
     <inspection_tool class="ObjectEqualsNull" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ObjectNotify" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreLibraryArguments" value="false" />
+      <option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
     </inspection_tool>
     <inspection_tool class="PointlessArithmeticExpression" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_ignoreExpressionsContainingConstants" value="true" />
diff --git a/.idea/libraries/Ant.xml b/.idea/libraries/Ant.xml
index 4d69c6899db3..dfdd147fd7bc 100644
--- a/.idea/libraries/Ant.xml
+++ b/.idea/libraries/Ant.xml
@@ -28,6 +28,7 @@
       <root url="jar://$PROJECT_DIR$/lib/ant/lib/ant-swing.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/ant/lib/ant-javamail.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/ant/src/bundled_ant_src.zip!/bundled_ant_src/main" />
     </SOURCES>
diff --git a/.idea/libraries/CGLIB.xml b/.idea/libraries/CGLIB.xml
index b7e692fa647e..061f6f213744 100644
--- a/.idea/libraries/CGLIB.xml
+++ b/.idea/libraries/CGLIB.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.1_3.jar!/src/proxy" />
     </SOURCES>
diff --git a/.idea/libraries/DTDParser.xml b/.idea/libraries/DTDParser.xml
index c40d012406c8..dcc82b44e627 100644
--- a/.idea/libraries/DTDParser.xml
+++ b/.idea/libraries/DTDParser.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/dtdparser113.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/EasyMock.xml b/.idea/libraries/EasyMock.xml
index cc51a3eea9a6..05648438f07a 100644
--- a/.idea/libraries/EasyMock.xml
+++ b/.idea/libraries/EasyMock.xml
@@ -4,5 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/easymockclassextension.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/easymock.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Eclipse.xml b/.idea/libraries/Eclipse.xml
index 7fa7c6724800..09b7e2c73bd4 100644
--- a/.idea/libraries/Eclipse.xml
+++ b/.idea/libraries/Eclipse.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/org.eclipse.jdt.core.source_3.5.2.v_981_R35x.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gant.xml b/.idea/libraries/Gant.xml
index ccd8bf04bef7..ec46297abec3 100644
--- a/.idea/libraries/Gant.xml
+++ b/.idea/libraries/Gant.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="file://$PROJECT_DIR$/build/lib/gant/lib" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/build/lib/gant/src.zip!/groovy" />
       <root url="jar://$PROJECT_DIR$/build/lib/gant/jps-sources.zip!/" />
diff --git a/.idea/libraries/Groovy.xml b/.idea/libraries/Groovy.xml
index 39ef164c7fa7..82c7bd9c0740 100644
--- a/.idea/libraries/Groovy.xml
+++ b/.idea/libraries/Groovy.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.7.3.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-1.7.3.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/JDOM.xml b/.idea/libraries/JDOM.xml
index bce78cc5489e..17d2e7336796 100644
--- a/.idea/libraries/JDOM.xml
+++ b/.idea/libraries/JDOM.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/jdom.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/jdom.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/JMock1.xml b/.idea/libraries/JMock1.xml
index 28bec95a2700..ca4dac06d5e2 100644
--- a/.idea/libraries/JMock1.xml
+++ b/.idea/libraries/JMock1.xml
@@ -4,5 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-1.0.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-cglib-1.0.1.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/JUnit3.xml b/.idea/libraries/JUnit3.xml
index c1b662d9bfb0..c8e5da0d1ec9 100644
--- a/.idea/libraries/JUnit3.xml
+++ b/.idea/libraries/JUnit3.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/JUnit4.xml b/.idea/libraries/JUnit4.xml
index 3293fe32308b..6e7ba44fb1d0 100644
--- a/.idea/libraries/JUnit4.xml
+++ b/.idea/libraries/JUnit4.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/junit-4.7.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/junit-4.7-src.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/JavaHelp.xml b/.idea/libraries/JavaHelp.xml
index a581fbd1d42b..458f03548750 100644
--- a/.idea/libraries/JavaHelp.xml
+++ b/.idea/libraries/JavaHelp.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/jh.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/jhsrc.jar!/src" />
     </SOURCES>
diff --git a/.idea/libraries/Jaxen.xml b/.idea/libraries/Jaxen.xml
index 8c9fa7adb99c..dd17c6df93a6 100644
--- a/.idea/libraries/Jaxen.xml
+++ b/.idea/libraries/Jaxen.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/jaxen-1.1.1.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Log4J.xml b/.idea/libraries/Log4J.xml
index 3179b1470772..6e3948c15fc9 100644
--- a/.idea/libraries/Log4J.xml
+++ b/.idea/libraries/Log4J.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/log4j.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/log4j.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/Mac.xml b/.idea/libraries/Mac.xml
index a12291d435e5..256d4c9e54a9 100644
--- a/.idea/libraries/Mac.xml
+++ b/.idea/libraries/Mac.xml
@@ -4,6 +4,7 @@
       <root url="jar://$PROJECT_DIR$/build/conf/mac/lib/quaqua.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/eawtstub.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/eawtstub_src.zip!/src" />
     </SOURCES>
diff --git a/.idea/libraries/Mocks.xml b/.idea/libraries/Mocks.xml
index e4bf218554bf..5a52b9d16391 100644
--- a/.idea/libraries/Mocks.xml
+++ b/.idea/libraries/Mocks.xml
@@ -12,5 +12,7 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-library-1.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-api-1.0.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/NanoXML.xml b/.idea/libraries/NanoXML.xml
index 0bb733ed7323..b189c1aeccf4 100644
--- a/.idea/libraries/NanoXML.xml
+++ b/.idea/libraries/NanoXML.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/nanoxml-2.2.3.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/nanoxml.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/OroMatcher.xml b/.idea/libraries/OroMatcher.xml
index 91713b2ea1e2..11cae893cfea 100644
--- a/.idea/libraries/OroMatcher.xml
+++ b/.idea/libraries/OroMatcher.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/oromatcher.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/TestNG.xml b/.idea/libraries/TestNG.xml
index a5778213fdef..5ab2412b1a6e 100644
--- a/.idea/libraries/TestNG.xml
+++ b/.idea/libraries/TestNG.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/plugins/testng/lib/testng-jdk15.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Trove4j.xml b/.idea/libraries/Trove4j.xml
index 3f41197d62e8..ffb447bb506b 100644
--- a/.idea/libraries/Trove4j.xml
+++ b/.idea/libraries/Trove4j.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/trove4j.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/trove4j_src.jar!/util/src" />
       <root url="jar://$PROJECT_DIR$/lib/src/trove4j_src.jar!/src" />
diff --git a/.idea/libraries/Velocity.xml b/.idea/libraries/Velocity.xml
index 3d7e67090faf..6af932840678 100644
--- a/.idea/libraries/Velocity.xml
+++ b/.idea/libraries/Velocity.xml
@@ -4,6 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/velocity.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.4.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/velocity-1.5-src.zip!/java" />
     </SOURCES>
diff --git a/.idea/libraries/XStream.xml b/.idea/libraries/XStream.xml
index d910ea261e1e..1ae2bba6df3e 100644
--- a/.idea/libraries/XStream.xml
+++ b/.idea/libraries/XStream.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/xstream.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Xerces.xml b/.idea/libraries/Xerces.xml
index c5dbcdcf4e97..70f9b6a585a0 100644
--- a/.idea/libraries/Xerces.xml
+++ b/.idea/libraries/Xerces.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/xerces.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/Xerces-J-src.2.8.1.zip!/xerces-2_8_1/src" />
     </SOURCES>
diff --git a/.idea/libraries/XmlBeans.xml b/.idea/libraries/XmlBeans.xml
index 77058a249a98..9ba2a85a0698 100644
--- a/.idea/libraries/XmlBeans.xml
+++ b/.idea/libraries/XmlBeans.xml
@@ -5,5 +5,7 @@
       <root url="jar://$PROJECT_DIR$/lib/xbean.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/resolver.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/XmlRPC.xml b/.idea/libraries/XmlRPC.xml
index ac9c9a5dbc94..4dc45f5b4c27 100644
--- a/.idea/libraries/XmlRPC.xml
+++ b/.idea/libraries/XmlRPC.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/xmlrpc-2.0.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/xmlrpc2.src.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/asm.xml b/.idea/libraries/asm.xml
index 183a1bb65b08..449c600c9d8d 100644
--- a/.idea/libraries/asm.xml
+++ b/.idea/libraries/asm.xml
@@ -4,6 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/asm.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/asm-commons.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/asm-src.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
index edbee5956ef0..3921ae1a3395 100644
--- a/.idea/libraries/commons_codec.xml
+++ b/.idea/libraries/commons_codec.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_collections.xml b/.idea/libraries/commons_collections.xml
index 346eec1cf896..489c3f067ebf 100644
--- a/.idea/libraries/commons_collections.xml
+++ b/.idea/libraries/commons_collections.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-collections.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/commons-collections-3.1-src.zip!/commons-collections-3.1/src/java" />
     </SOURCES>
diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
index 735f56f94f1e..ba16df792f70 100644
--- a/.idea/libraries/commons_lang.xml
+++ b/.idea/libraries/commons_lang.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.4.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_net.xml b/.idea/libraries/commons_net.xml
index a67717822b3e..73d5abb5afc1 100644
--- a/.idea/libraries/commons_net.xml
+++ b/.idea/libraries/commons_net.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-net-2.0-patched.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/commons-net-2.0-patched-src.zip!/commons-net-2.0-src/src/main/java" />
     </SOURCES>
diff --git a/.idea/libraries/jcip.xml b/.idea/libraries/jcip.xml
index 1a6bfae9c4c1..5109f151a699 100644
--- a/.idea/libraries/jcip.xml
+++ b/.idea/libraries/jcip.xml
@@ -3,5 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/jcip-annotations.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/jgoodies_forms.xml b/.idea/libraries/jgoodies_forms.xml
index 6d2c19a1d4c8..0acd33f16bd7 100644
--- a/.idea/libraries/jgoodies_forms.xml
+++ b/.idea/libraries/jgoodies_forms.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/jgoodies-forms.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/jgoodies-forms-src.zip!/" />
     </SOURCES>
diff --git a/.idea/libraries/jna.xml b/.idea/libraries/jna.xml
index 9fbb37eb48fc..8c0751775e1e 100644
--- a/.idea/libraries/jna.xml
+++ b/.idea/libraries/jna.xml
@@ -4,5 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/jna-utils.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/jna.jar!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/microba.xml b/.idea/libraries/microba.xml
index 771a1df5a98f..893e0dcc7f2a 100644
--- a/.idea/libraries/microba.xml
+++ b/.idea/libraries/microba.xml
@@ -4,5 +4,7 @@
       <root url="jar://$PROJECT_DIR$/lib/microba.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/src/microba-src.zip!/" />
     </CLASSES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/picocontainer.xml b/.idea/libraries/picocontainer.xml
index e07ed90f94b5..0850ebb24085 100644
--- a/.idea/libraries/picocontainer.xml
+++ b/.idea/libraries/picocontainer.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/picocontainer.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/picocontainer-src.zip!/picocontainer-1_2/container/src/java" />
     </SOURCES>
diff --git a/.idea/libraries/tcServiceMessages.xml b/.idea/libraries/tcServiceMessages.xml
index 2117ae66d481..e3cc93f1d751 100644
--- a/.idea/libraries/tcServiceMessages.xml
+++ b/.idea/libraries/tcServiceMessages.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/serviceMessages.jar!/" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/src/serviceMessages_201292_src.zip!/src" />
     </SOURCES>
diff --git a/.idea/projectCodeStyle.xml b/.idea/projectCodeStyle.xml
index 3c12c99e6c56..f71917e9772d 100644
--- a/.idea/projectCodeStyle.xml
+++ b/.idea/projectCodeStyle.xml
@@ -15,6 +15,7 @@
             <option name="SMART_TABS" value="false" />
             <option name="LABEL_INDENT_SIZE" value="0" />
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
         </option>
         <option name="JSP_INDENT_OPTIONS">
@@ -26,6 +27,7 @@
             <option name="SMART_TABS" value="false" />
             <option name="LABEL_INDENT_SIZE" value="0" />
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
         </option>
         <option name="XML_INDENT_OPTIONS">
@@ -37,6 +39,7 @@
             <option name="SMART_TABS" value="false" />
             <option name="LABEL_INDENT_SIZE" value="0" />
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
         </option>
         <option name="OTHER_INDENT_OPTIONS">
@@ -48,6 +51,7 @@
             <option name="SMART_TABS" value="false" />
             <option name="LABEL_INDENT_SIZE" value="0" />
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
         </option>
         <option name="ELSE_ON_NEW_LINE" value="true" />
@@ -64,8 +68,6 @@
         <option name="SPACE_AFTER_TYPE_CAST" value="false" />
         <option name="FIELD_NAME_PREFIX" value="my" />
         <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
-        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
-        <option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
         <option name="RIGHT_MARGIN" value="140" />
         <option name="CALL_PARAMETERS_WRAP" value="1" />
         <option name="METHOD_PARAMETERS_WRAP" value="5" />
@@ -93,6 +95,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
           <option name="INDENT_SIZE" value="2" />
@@ -102,6 +105,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
           <option name="INDENT_SIZE" value="2" />
@@ -111,6 +115,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="haml">
           <option name="INDENT_SIZE" value="2" />
@@ -120,6 +125,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="java">
           <option name="INDENT_SIZE" value="2" />
@@ -129,6 +135,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="js">
           <option name="INDENT_SIZE" value="4" />
@@ -138,6 +145,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
           <option name="INDENT_SIZE" value="2" />
@@ -147,6 +155,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="rb">
           <option name="INDENT_SIZE" value="2" />
@@ -156,6 +165,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="sass">
           <option name="INDENT_SIZE" value="2" />
@@ -165,6 +175,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="sql">
           <option name="INDENT_SIZE" value="2" />
@@ -174,6 +185,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="txt">
           <option name="INDENT_SIZE" value="4" />
@@ -183,6 +195,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="xml">
           <option name="INDENT_SIZE" value="2" />
@@ -192,6 +205,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="yml">
           <option name="INDENT_SIZE" value="2" />
@@ -201,6 +215,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
       </value>
     </option>