Combine labs and production classes for keystone redis and include with keystone server

Change-Id: I36d1824f1278b441540882e232a0363ce0e12f96