beanstalk: initial BeanStalk changes from CM.

-correct CM naming conventions.
-remove some overlay values not in BeanStalk