Add flavor=keystone configuration options to paste_deploy section in conf files

Bug: 1154246

Change-Id: If3544c41b433b83dc0c975aa76761d535640d285
author: Sean Winn
Merge "Add flavor=keystone configuration options to paste_deploy section in conf files" into stable/grizzly