code conventions for branch inherit for WEB-6611 +review WEBCR-208