Fix #3649.
Err! Swapped the paramters: sls and env...
Merge pull request #3686 from kjkuan/bugfix_merge_included_states

Fix #3649.