Clean up cookbook for bp/clean-up-attr-for-mq-and-db

This change removes the attributes we'll be moving to openstack-common
and changes reference of those attributes to reflect new (more
consistent) namespace.

Also remove Berksfile.lock so that updated version of common cookbook is
used.

Change-Id: I6d6b3849671d56d337aced0f8288b6a201f80ac0
Implements: blueprint clean-up-attr-for-mq-and-db