Merge pull request #1262 from FranciscoBorges/schema

Move remaining options into schema.
replace ProtocolType with String
Merge pull request #1261 from andytaylor/master

replace ProtocolType with String
https://bugzilla.redhat.com/show_bug.cgi?id=899989 Fix message ID of log message