Merge branch 'cpucount' into 'master'

lib/refrepo/gen/oar-properties.rb

lib/refrepo/gen/wiki/generators/oar_properties.rb

spec/output/bad_best_effort_property_diff_stdout.txt

spec/output/bad_best_effort_property_print_stdout.txt

spec/output/chassis_unset_diff_stdout.txt

spec/output/chassis_unset_print_stdout.txt

spec/output/configured_misconfigured_cores_diff_stdout.txt

spec/output/configured_misconfigured_cores_print_stdout.txt

spec/output/configured_misconfigured_gpu_diff_stdout.txt

spec/output/configured_misconfigured_gpu_print_stdout.txt

...put/configured_missing_network_interfaces_diff_stdout.txt

...ut/configured_missing_network_interfaces_print_stdout.txt

spec/output/configured_with_disk_diff_stdout.txt

spec/output/configured_with_disk_print_stdout.txt

spec/output/configured_without_gpu_diff_stdout.txt

spec/output/configured_without_gpu_print_stdout.txt

...tput/configured_without_gpu_quirk_cluster_diff_stdout.txt

...put/configured_without_gpu_quirk_cluster_print_stdout.txt

spec/output/dahu_empty_diff_stdout.txt

spec/output/dahu_empty_print_stdout.txt