Updated no_shelllogin_for_systemaccounts to reflect RHEL7 UIDs starting at 1000
Renamed accounts_password_pam_cracklib_retry.xml --> accounts_password_pam_retry, updated for RHEL7

- Renamed XCCDF/OVAL to accounts_password_pam_retry to reflect requirement (pam retry) vs implimentation
- Updated OVAL to include conditional check of OS, then will check either cracklib or pwquality
Updated installed_OS_is_rhel7

Updated state/object names as when performing "if rhel6; do something; elseif rhel7" you receive naming collisions
Updated accounts_password_pam_retry XCCDF & relinked OVAL into RHEL/7/shared
new bash remediation for file_permissions_grub2_cfg
Update shell prompts in shorthand2xccdf
[RHEL/7] Update RHEL-7 service_*_enabled.sh remediation fixes to
         start using # systemctl ... rather than # chkconfig ...
Updated shorthand2xccdf to drop sudo from systemctl is-enabled

per https://github.com/OpenSCAP/scap-security-guide/pull/252#issuecomment-56951615
Dropped file_permissions_grub2_cfg remediation from rhel6

per ianko's comments @
https://github.com/OpenSCAP/scap-security-guide/pull/250
Moved file_permissions_grub2_cfg.sh from shared/ to rhel7 fixes

per https://github.com/OpenSCAP/scap-security-guide/pull/250
Merge pull request #252 from shawndwells/fileperms-desc-macro

updating command prompts in shorthand2xccdf.xslt, bash remediations
Merge pull request #257 from shawndwells/file_permissions_grub2_cfg

delinked grub2 remediation
Merge pull request #256 from iankko/rhel7_update_service_enabled_remediation_fixes

[bugfix] [RHEL/7] Update RHEL-7 service_*_enabled.sh remediation fixes to start using # systemctl ... rather than # chkconfig ...
Updated installed_OS regex

Slashes in old regex were escaping the ".", making it literally interpretted.
Resolving installed_os_rhel7 merge conflicts
Merge remote-tracking branch 'origin/master' into accounts_password_pam_cracklib_retry

merge for PR 246
Merge branch 'accounts_password_pam_cracklib_retry' of https://github.com/shawndwells/scap-security-guide into shawndwells-accounts_password_pam_cracklib_retry

Conflicts:
	shared/oval/installed_OS_is_rhel7.xml
Merge pull request #259 from shawndwells/installed_OS_regex

Updated installed_OS regex
Merge branch 'shawndwells-accounts_password_pam_cracklib_retry'

Merging installed_OS checks