fix bugs in set-servicelogging
Rename time out parameter and check the combinations of service logging properties
revert changes on time out parameters
apply review comments
Use enum for service type and metrics type
merge storage branch