Some fixes#534

abel1502 wants to merge 5 commits into

keystone-engine:masterkeystone-engine/keystone:masterfrom

abel1502:masterabel1502/keystone:masterCopy head branch name to clipboard