Merge branch 'incomplete-clusters2' into 'master'

lib/refrepo/gen/oar-properties.rb

...fiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt

...iti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt

...iti-gpu-removed-OAR-updated-gpu-re-added_table_stdout.txt

spec/output/graffiti-gpu-removed_diff_stdout.txt

spec/output/graffiti-gpu-removed_print_stdout.txt

spec/output/graffiti-gpu-removed_table_stdout.txt

spec/output/with_too_few_oar_resources_diff_stdout.txt

spec/output/with_too_few_oar_resources_print_stdout.txt

spec/output/with_too_few_oar_resources_table_stdout.txt

spec/output/with_too_many_oar_resources_diff_stdout.txt

spec/output/with_too_many_oar_resources_print_stdout.txt

spec/output/with_too_many_oar_resources_table_stdout.txt