don't use pushd/popd

Conflicts:
	tools/packages/opennms/opennms.spec
Merge branch '1.10' into 1.12

Conflicts:
	tools/packages/opennms/opennms.spec