Merge "Added move of branding jar to assembly"