GRP-1079, GRP-1081
GRP-1079: change existing gsh to executable and dos2unix
GRP-1081: upgrader does not resolve group subjects correctly, prompt
user to
Merge branch 'GROUPER_2_2_BRANCH' of https://github.com/Internet2/grouper.git into GROUPER_2_2_BRANCH