Set default package options for ubuntu & rhel

Also fixed ServerSpec tests as they've been failing since the ServerSpec 2.0 update.

CC @portertech 
Rubocop wants it to be aligned with the if statement. No change in indentation style.