Made keystone authentication configurable and off by default. Code review changes (STOX-14)