Add Credentials module in specs
Support configuration of keys
Update specs to use key configuration

Add spec to ensure backwards compatibility
Make specs r1.8 compatible