Sync keystone module and state with the salt master

keystone module and the state is out of date and lack a lot of
method. Sync the module and state with the salt master.
(copy from salt fc28d000565d40f0f7ab4c01f58464bcd19a84c3)

Change-Id: I67e75d423775d56e7eaf00c9903ba9503da0c0b2