Better Annotations (latest opscoderl_wm)


Requires:
  - https://github.com/opscode/opscoderl_wm/pull/4
  - https://github.com/opscode/omnibus-chef-server/pull/12