Merge branch 'master' into publish-runner

Conflicts:
	nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java

diff --cc nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
index 5c5209044e12cd9ba4adc08edb7ec7d909445e91,3c77d898e81d650f553c52b9bc282511e6041829..c8985536b6b6fa58c3f763654911d3e73f2bf898
--- 1/nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
--- 2/nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
+++ b/nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
@@@ -24,10 -23,9 +24,9 @@@ import jetbrains.buildServer.agent.Cons
   * Date: 07.07.11 13:56\r
   */\r
  public interface PackagesConstants {\r
-   public static final String INSTALL_RUN_TYPE = "jetbrains.nuget.packagesInstaller";\r
+   public static final String RUN_TYPE = "jb.nuget.installer"; //no more than 30 chars\r
 -\r
 +  public static final String PUBLISH_RUN_TYPE = "jb.nuget.publish"; //run-type could never exceed 30 chars\r
  \r
- \r
    public static final String NUGET_PATH = "nuget.path";\r
    public static final String NUGET_SOURCES = "nuget.sources";\r
    public static final String NUGET_EXCLUDE_VERSION = "nuget.excludeVersion";\r

diff --cc nuget-tests/src/testng-nuget-tests..xml
Simple merge