Merged 5.1.N (5.1.1) to HEAD (5.1)

120821 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120757 adragoi: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120693 abalmus: MNT-14681 : No VersionType is set when content is updated and autoversion is active
            - Provided fix and tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/version/Version2ServiceImpl.java

@@ -326,6 +326,12 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
                     nodeRef,
                     ContentModel.PROP_VERSION_LABEL,
                     version.getVersionLabel());
+
+            // Set the version type (MNT-14681 fix)
+            this.nodeService.setProperty(
+                    nodeRef,
+                    ContentModel.PROP_VERSION_TYPE,
+                    version.getVersionType());
         }
         finally
         {