Invert order of hiera lookups

* read yaml, then etcd
* give puppetdb more time to start up during test