Fix default imports and qml directory

Correct typo that was causing INSTALL_FEATURES to be
set instead of the appropriate variable.
Merge branch '3.0' into 3.1
Merge branch '3.1'