Merge proposals dependent on lp:~bhdouglass/rockwork/configuration-fix

lp:~bhdouglass/rockwork/configuration-fix has no merge proposals.