Merge branch Gaya-8.1.x

diff --cc .idea/libraries/TeamCity_Open_API_common.xml
index 6635ed0b369e60002b1b9eca157cb896dcd578a1,96581cf4532cd8793259c35e9075a1b7c3259242..92a7717f361b03f63ed6c4a0ae70f4a0eae290bf
--- 1/.idea/libraries/TeamCity_Open_API_common.xml
--- 2/.idea/libraries/TeamCity_Open_API_common.xml
+++ b/.idea/libraries/TeamCity_Open_API_common.xml
@@@ -3,9 -3,7 +3,8 @@@
      <CLASSES>\r
        <root url="jar://$TeamCityDistribution$/devPackage/common-api.jar!/" />\r
        <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/log4j-1.2.12.jar!/" />\r
-       <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/commons-codec-1.3.jar!/" />\r
        <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/xmlrpc-2.0.1.jar!/" />\r
 +      <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/trove-3.0.3.jar!/" />\r
        <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/trove4j.jar!/" />\r
      </CLASSES>\r
      <JAVADOC>\r