ede6be2 Rebase to 2017 update 7.

Authored and Committed by jjames 7 years ago
    Rebase to 2017 update 7.
    
    Also:
    - Use the license macro.
    - Ship the new cmake files in -devel.
    
        
file modified
+1 -1
file modified
+22 -3