domain_id_attributes in config.py have wrong default value

Also, as requested I put in this bug fix the related updates
to keystone.conf.sample

Fixes Bug1131443
Fixes Bug1131439

Change-Id: I3e973c8f8ad2783153a2ccb3d743b65eec47e749
Merge "domain_id_attributes in config.py have wrong default value"
command line switch for short pep8 output.

Change-Id: I65e9ce051012b3afc9a088423f9d805927604331