Fix conditionals
Merge branch 'feature/fix_conditionals' into develop

* feature/fix_conditionals:
  Fix conditionals

Conflicts:
	lib/hiera/backend/s3_backend.rb