Merge branch 'v5.x' of https://github.com/unitycontainer/unity into v5.x

Author: ENikS

.gitmodules

@@ -21,7 +21,6 @@
 [submodule "RegistrationByConvention"]
 	path = RegistrationByConvention
 	url = https://github.com/unitycontainer/registration-by-convention.git
-	branch = master
 [submodule "CommonServiceLocator"]
 	path = CommonServiceLocator
 	url = https://github.com/unitycontainer/commonservicelocator.git