ec2 and service handlers added to keystone
added service and larger example to keystone state
Merge pull request #7227 from KennethWilke/develop

Added keystone service and ec2 handling