Update package_file naming convention
Merge branch 'cb-2.2.0-compatibility' of https://github.com/joebalancio/couchbase into joebalancio-cb-2.2.0-compatibility

Conflicts:
	attributes/server.rb