Bump version to 2.1.0
Bump version to 1.5.0
Merge branch 'master' into 1.x

Conflicts:
	lib/librarian/puppet/version.rb