Adding provided scope

Conflicts:
	gradle/convention.gradle
Fixing transitive-ness of provided
Merge remote-tracking branch 'build/multi-project' into 1.1
Merge pull request #183 from jasobrown/1.1

pulling in latest changes to netflix gradle build template