Sys repckg rule config etc

Went ahead and did a merge. You can ignore this pull request though and reproduce this using git pull -s ours upstream master. Pretty easy actually.