Fix inclusion of explicitly added profiles in jar

Closes #1701
Merge pull request #1709 from hugoduncan/allow-all-non-default-profiles-in-jar

Fix inclusion of explicitly added profiles in jar
Merge remote-tracking branch 'upstream/master'