Use package_options on installation/upgrade
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana