fixes #2788 - changes to fixtures and tests in preparation for testing adding/removing puppetclasses

(cherry picked from commit 1ef5ee75d794f024c75d6be96ac04ff398118e26)

Conflicts:
	test/fixtures/lookup_keys.yml
fixes #2851 - refresh puppet classes on environment change

(cherry picked from commit 241ed0a35571062cf7fc6489dc31f3b26f3edd78)