Fixes bug in scheduler filter for Savanna

Merge default options for Savanna filter
and define it in the upper layer to avoid
duplicates

Change-Id: I833354d3872a3a86accfe1bb6ec51438bfc5618e
Closes-Bug: #1327987